Changeset 2291 for trunk/src/objects

Timestamp:

Jun 23, 2011, 1:51:42 PM (13 years ago)

Author:

ldelgass

Message:

Fix mismatched allocation/deletion of field value char arrays. The arrays were
being allocated with new[] and being deleted with the plain delete operator
instead of delete[], which can lead to heap corruption and/or memory leaks.
The problem was found by the cppcheck tool.

File:

• trunk/src/objects/RpParserXML.cc (modified) (6 diffs)

trunk/src/objects/RpParserXML.cc

@@ -97 +97 @@
             Rp_TreeSetValue(inf->tree,inf->curr,Rp_ParserXml_Field_VALUE,
                 (void *)newValue);
-            delete value;
+            delete[] value;
             value = NULL;
         }
@@ -420 +420 @@
             }
             // free the old data
-            delete(oldval);
+            delete[] oldval;
             oldval = NULL;
         }
@@ -477 +477 @@
         if (oldval != NULL) {
             // free the old data
-            delete(oldval);
+            delete[] oldval;
             oldval = NULL;
         }
@@ -491 +491 @@
     n = vsnprintf(stackSpace, stackSize, format, lst);
     if (n >= stackSize) {
-        delete stackSpace;
+        delete[] stackSpace;
         stackSpace = new char[n];
         vsnprintf(stackSpace, n, format, lst);
@@ -545 +545 @@
     n = vsnprintf(stackSpace, stackSize, format, lst);
     if (n >= stackSize) {
-        delete stackSpace;
+        delete[] stackSpace;
         stackSpace = new char[n];
         vsnprintf(stackSpace, n, format, lst);
@@ -558 +558 @@
         strcat(newval,stackSpace);
         // free the old data
-        delete(oldval);
+        delete[] oldval;
         oldval = NULL;
-        delete(stackSpace);
+        delete[] stackSpace;
         stackSpace = NULL;
     }