From: František Dvořák Date: Mon, 3 Sep 2012 13:28:46 +0000 (+0000) Subject: Fix segfault when html header is not specified and doesn't exist in default location. X-Git-Tag: glite-lb-client_R_5_2_4_1~2 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=f737de03753f0e9e944e9398849abf72f0325124;p=jra1mw.git Fix segfault when html header is not specified and doesn't exist in default location. --- diff --git a/org.glite.lb.server/src/lb_html.c b/org.glite.lb.server/src/lb_html.c index 07c1e82..01182a5 100644 --- a/org.glite.lb.server/src/lb_html.c +++ b/org.glite.lb.server/src/lb_html.c @@ -79,7 +79,7 @@ char *get_html_header(edg_wll_Context ctx, int text) { if (text) return NULL; - if ((header_file = fopen(ctx->html_header_file, "r"))) { + if (ctx->html_header_file && (header_file = fopen(ctx->html_header_file, "r")) != NULL) { rlen = getdelim( &header, &header_len, '\0', header_file); fclose (header_file); } @@ -382,7 +382,7 @@ int edg_wll_UserNotifsToHTML(edg_wll_Context ctx UNUSED_VAR, char **notifids, ch "

Total of %d" "

%s" "\t\r\n", - header, + header ? header : "", heading, mylink ? mylink : "", alllink ? alllink : "", @@ -883,7 +883,7 @@ char *edg_wll_ErrorToHTML(edg_wll_Context ctx,int code) header = get_html_header(ctx, 0); asprintf(&out, "\n\n\nError\n%s\n\n" "

%s

\n" - "%d: %s (%s)",header,msg,e,et,ed); + "%d: %s (%s)",header ? header : "",msg,e,et,ed); free(et); free(ed); return out;