Changeset 8620 for source/ariba/utility

Timestamp:

Oct 4, 2010, 2:27:16 PM (14 years ago)

Author:

Christoph Mayer

Message:

-mem leaks

Location:

source/ariba/utility

Files:

• messages/Message.cpp (modified) (1 diff)
• serialization/Data.hpp (modified) (1 diff)

source/ariba/utility/messages/Message.cpp

@@ -88 +88 @@
         Data data = data_serialize(&msg);
         stream << ",data=" << data;
-//      data.release();
+        data.release();
         stream << ")";
         return stream;

source/ariba/utility/serialization/Data.hpp

@@ -396 +396 @@
                 size_t res_length = calcLength(new_length);
                 if (old_length != res_length) {
-                        T* new_buffer = new T[res_length];
-                        if (bufferPtr != NULL) {
-                                size_t clength = res_length < old_length ? res_length : old_length;
-                                memcpy( new_buffer, bufferPtr, clength*sizeof(T) );
-                                delete [] bufferPtr;
+
+                        if(res_length <= 0){
+                                if (bufferPtr != NULL) delete [] bufferPtr;
+                                bufferPtr = NULL;
+                                bufferLen = 0;
+                        }else{
+                                T* new_buffer = new T[res_length];
+                                if (new_buffer != NULL) memset(new_buffer, 0, res_length*sizeof(T));
+                                if (bufferPtr != NULL) {
+                                        size_t clength = res_length < old_length ? res_length : old_length;
+                                        memcpy( new_buffer, bufferPtr, clength*sizeof(T) );
+                                        delete [] bufferPtr;
+                                }
+                                bufferPtr = new_buffer;
+                                bufferLen = new_length;
                         }
-                        bufferPtr = new_buffer;
-                        bufferLen = new_length;
                 }
         }