[ 2818014 ] EnumerateClasses segfault w/DeepInheritance prop setting

kkaempf · Dec 16, 2009 · 8b313e8 · 8b313e8
1 parent 581810b
commit 8b313e8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-16  Chris Buccella  <buccella@linux.vnet.ibm.com>
+
+	* result.c:
+	[ 2818014 ] EnumerateClasses segfault w/DeepInheritance prop setting
+	(refix)
+
 2009-12-15  Surendra Kodali  
 
         * ABTScript

diff --git a/NEWS b/NEWS
@@ -37,6 +37,7 @@ Bugs fixed:
 - 2913067 Unused arg for newProviderRegister()
 - 2915198 Interop Server Provider returns incorrect object
 - 2893373 Test reports need to include xml results files
+- 2818014 EnumerateClasses segfault w/DeepInheritance prop setting
 
 Changes in 1.3.5
 ================

diff --git a/result.c b/result.c
@@ -132,15 +132,17 @@ static void* nextResultBufferPos(NativeResult *nr, int type, int length)
 
    /* if there won't be enough room, send it off or make nr->data bigger */
    if (nr->dNext+length>=nr->dMax) {
-      if (nr->requestor) {
+      /* either we aren't chunking or length > buffer size */
+      if (!nr->requestor || length>=nr->dMax) { 
+         while (nr->dNext+length>=nr->dMax) nr->dMax*=2;
+         nr->data=(char*)realloc(nr->data,nr->dMax);
+      }
+      /* xfering current contents to make enough room */
+      else {
 	 xferResultBuffer(nr,nr->requestor, 1,1, length);
          nr->dNext=0;
          nr->sNext=0;
       }
-      else { 
-         while (nr->dNext+length>=nr->dMax) nr->dMax*=2;
-         nr->data=(char*)realloc(nr->data,nr->dMax);
-      }
    }
 
    if (nr->sNext==nr->sMax) {