isdnd(8): Fix some NULL dereferences.

Taken-from: FreeBSD

diff --git a/usr.sbin/i4b/isdnd/log.c b/usr.sbin/i4b/isdnd/log.c
index 370add4..49ab9c3 100644 (file)
--- a/usr.sbin/i4b/isdnd/log.c
+++ b/usr.sbin/i4b/isdnd/log.c
@@ -126,7 +126,7 @@ init_log(void)
 void
 finish_log(void)
 {
-       if(uselogfile)
+       if(uselogfile && logfp)
        {
                fflush(logfp);
                fclose(logfp);

diff --git a/usr.sbin/i4b/isdnd/main.c b/usr.sbin/i4b/isdnd/main.c
index 8b08f1f..bac6a30 100644 (file)
--- a/usr.sbin/i4b/isdnd/main.c
+++ b/usr.sbin/i4b/isdnd/main.c
@@ -776,8 +776,11 @@ reopenfiles(int dummy)
        {
                /* close file */
                
-               fflush(acctfp);
-               fclose(acctfp);
+               if(acctfp)
+               {
+                       fflush(acctfp);
+                       fclose(acctfp);
+               }
 
                /* if user specified a suffix, rename the old file */
                

diff --git a/usr.sbin/i4b/isdnd/rc_config.c b/usr.sbin/i4b/isdnd/rc_config.c
index 8e12068..5b4fb74 100644 (file)
--- a/usr.sbin/i4b/isdnd/rc_config.c
+++ b/usr.sbin/i4b/isdnd/rc_config.c
@@ -76,17 +76,17 @@ configure(char *filename, int reread)
 
        yyin = fopen(filename, "r");
 
-       if(reread)
-       {
-               reset_scanner(yyin);
-       }
-       
-       if (yyin == NULL)
+       if(yyin == NULL)
        {
                log(LL_ERR, "cannot fopen file [%s]", filename);
                exit(1);
        }
 
+       if(reread)
+       {
+               reset_scanner(yyin);
+       }
+       
        yyparse();
        
        monitor_fixup_rights();
@@ -455,8 +455,10 @@ cfg_setval(int keyword)
                                                fclose(fp);
                                                fp = fopen(yylval.str, "w");
                                                if(fp != NULL)
+                                               {
                                                        fprintf(fp, "%d %d %d", (int)time(NULL), (int)time(NULL), 0);
-                                               fclose(fp);
+                                                       fclose(fp);
+                                               }
                                        }
                                }
                                else
@@ -464,8 +466,10 @@ cfg_setval(int keyword)
                                        DBGL(DL_RCCF, (log(LL_DBG, "entry %d: creating budget-callbacksfile %s", entrycount, yylval.str)));
                                        fp = fopen(yylval.str, "w");
                                        if(fp != NULL)
+                                       {
                                                fprintf(fp, "%d %d %d", (int)time(NULL), (int)time(NULL), 0);
-                                       fclose(fp);
+                                               fclose(fp);
+                                       }
                                }
 
                                fp = fopen(yylval.str, "r");
@@ -506,8 +510,10 @@ cfg_setval(int keyword)
                                                fclose(fp);
                                                fp = fopen(yylval.str, "w");
                                                if(fp != NULL)
+                                               {
                                                        fprintf(fp, "%d %d %d", (int)time(NULL), (int)time(NULL), 0);
-                                               fclose(fp);
+                                                       fclose(fp);
+                                               }
                                        }
                                }
                                else
@@ -515,8 +521,10 @@ cfg_setval(int keyword)
                                        DBGL(DL_RCCF, (log(LL_DBG, "entry %d: creating budget-calloutsfile %s", entrycount, yylval.str)));
                                        fp = fopen(yylval.str, "w");
                                        if(fp != NULL)
+                                       {
                                                fprintf(fp, "%d %d %d", (int)time(NULL), (int)time(NULL), 0);
-                                       fclose(fp);
+                                               fclose(fp);
+                                       }
                                }
 
                                fp = fopen(yylval.str, "r");