From: tecodev <tecodev@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 12 Jun 2007 23:08:19 +0000 (+0000)
Subject: * src/SDCCmain.c: prevent NULL pointer dereference, avoid warning
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=cc6a9a03a9dbf3e65f50295ce600764551221060;p=fw%2Fsdcc

* src/SDCCmain.c: prevent NULL pointer dereference, avoid warning


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@4851 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 9a1ce174..b4823f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-13 Raphael Neider <rneider AT web.de>
+
+	* src/SDCCmain.c: prevent NULL pointer dereference, avoid warning
+
 2007-06-12 Raphael Neider <rneider AT web.de>
 
 	* support/scripts/inc2h.pl: conditionally emit defines for SFR bits,
diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index d8eb615f..71fb8863 100644
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -793,11 +793,11 @@ scanOptionsTable(const OPTION *optionsTable, char shortOpt, const char *longOpt,
         }
       else
         {
-          size_t len = strlen(optionsTable[i].longOpt);
+          size_t len = optionsTable[i].longOpt ? strlen(optionsTable[i].longOpt) : 0;
 
           if (longOpt &&
             (optionsTable[i].arg_type != CLAT_BOOLEAN ||
-            optionsTable[i].arg_type == CLAT_BOOLEAN && len == strlen(longOpt) && optionsTable[i].longOpt) &&
+            (optionsTable[i].arg_type == CLAT_BOOLEAN && len == strlen(longOpt) && optionsTable[i].longOpt)) &&
             strncmp(optionsTable[i].longOpt, longOpt, len) == 0)
             {
               /* If it is a flag then we can handle it here */