SWIG

Revision: 13894
          http://swig.svn.sourceforge.net/swig/?rev=13894&view=rev
Author:   wsfulton
Date:     2012-11-16 19:36:46 +0000 (Fri, 16 Nov 2012)
Log Message:
-----------
Consider strchr failing in a few places

Modified Paths:
--------------
    trunk/Source/Swig/typeobj.c

Modified: trunk/Source/Swig/typeobj.c
===================================================================
--- trunk/Source/Swig/typeobj.c	2012-11-16 19:35:33 UTC (rev 13893)
+++ trunk/Source/Swig/typeobj.c	2012-11-16 19:36:46 UTC (rev 13894)
@@ -627,8 +627,8 @@
 
   if (c && (strncmp(c, "a(", 2) == 0)) {
     c = strchr(c, '.');
-    c++;
-    return (*c == 0);
+    if (c)
+      return (*(++c) == 0);
   }
   return 0;
 }
@@ -654,8 +654,10 @@
 
   while (c && (strncmp(c, "a(", 2) == 0)) {
     c = strchr(c, '.');
-    c++;
-    ndim++;
+    if (c) {
+      c++;
+      ndim++;
+    }
   }
   return ndim;
 }
@@ -665,8 +667,10 @@
   char *c = Char(t);
   while (c && (strncmp(c, "a(", 2) == 0) && (n > 0)) {
     c = strchr(c, '.');
-    c++;
-    n--;
+    if (c) {
+      c++;
+      n--;
+    }
   }
   if (n == 0) {
     String *dim = SwigType_parm(c);
@@ -695,8 +699,10 @@
 
   while (c && (strncmp(c, "a(", 2) == 0) && (n > 0)) {
     c = strchr(c, '.');
-    c++;
-    n--;
+    if (c) {
+      c++;
+      n--;
+    }
   }
   if (n == 0) {
     temp = *c;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13903
          http://swig.svn.sourceforge.net/swig/?rev=13903&view=rev
Author:   wsfulton
Date:     2012-11-18 00:44:39 +0000 (Sun, 18 Nov 2012)
Log Message:
-----------
Remove some possible buffer overflows

Modified Paths:
--------------
    trunk/Source/Swig/typeobj.c

Modified: trunk/Source/Swig/typeobj.c
===================================================================
--- trunk/Source/Swig/typeobj.c	2012-11-18 00:44:19 UTC (rev 13902)
+++ trunk/Source/Swig/typeobj.c	2012-11-18 00:44:39 UTC (rev 13903)
@@ -430,7 +430,7 @@
  * ----------------------------------------------------------------------------- */
 
 SwigType *SwigType_add_qualifier(SwigType *t, const_String_or_char_ptr qual) {
-  char temp[256], newq[256];
+  String *newq;
   int sz, added = 0;
   char *q, *cqual;
 
@@ -438,8 +438,9 @@
   cqual = Char(qual);
 
   if (!(strncmp(c, "q(", 2) == 0)) {
-    sprintf(temp, "q(%s).", cqual);
+    String *temp = NewStringf("q(%s).", cqual);
     Insert(t, 0, temp);
+    Delete(temp);
     return t;
   }
 
@@ -449,40 +450,40 @@
      order */
 
   sz = element_size(c);
-  strncpy(temp, c, (sz < 256) ? sz : 256);
 
-  if (strstr(temp, cqual)) {
+  if (strstr(c, cqual)) {
     /* Qualifier already added */
     return t;
   }
 
   /* Add the qualifier to the existing list. */
 
-  strcpy(newq, "q(");
-  q = temp + 2;
+  newq = NewString("q(");
+  q = c + 2;
   q = strtok(q, " ).");
   while (q) {
     if (strcmp(cqual, q) < 0) {
       /* New qualifier is less that current qualifier.  We need to insert it */
-      strcat(newq, cqual);
-      strcat(newq, " ");
-      strcat(newq, q);
+      Append(newq, cqual);
+      Append(newq, " ");
+      Append(newq, q);
       added = 1;
     } else {
-      strcat(newq, q);
+      Append(newq, q);
     }
     q = strtok(NULL, " ).");
     if (q) {
-      strcat(newq, " ");
+      Append(newq, " ");
     }
   }
   if (!added) {
-    strcat(newq, " ");
-    strcat(newq, cqual);
+    Append(newq, " ");
+    Append(newq, cqual);
   }
-  strcat(newq, ").");
+  Append(newq, ").");
   Delslice(t, 0, sz);
   Insert(t, 0, newq);
+  Delete(newq);
   return t;
 }
 
@@ -590,11 +591,11 @@
  * ----------------------------------------------------------------------------- */
 
 SwigType *SwigType_add_array(SwigType *t, const_String_or_char_ptr size) {
-  char temp[512];
-  strcpy(temp, "a(");
-  strcat(temp, Char(size));
-  strcat(temp, ").");
+  String *temp = NewString("a(");
+  Append(temp, size);
+  Append(temp, ").");
   Insert(t, 0, temp);
+  Delete(temp);
   return t;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.