Changeset 38320

Timestamp:

May 25, 2015, 12:44:08 PM (11 years ago)

Author:

eugene

Message:

fix an initialization failure

File:

• branches/eam_branches/ipp-20150419/Ohana/src/libohana/src/config.c (modified) (4 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/libohana/src/config.c

@@ -395 +395 @@
   Nbytes = 0;
   NBYTES = D_NBYTES;
-  ALLOCATE (ibuffer, char, NBYTES + 2);
-    
+  ALLOCATE_ZERO (ibuffer, char, NBYTES + 2);
+
   /* load data from file */
   while ((nbytes = fread (&ibuffer[Nbytes], sizeof(char), D_NBYTES, f)) == D_NBYTES) {
@@ -402 +402 @@
     NBYTES += D_NBYTES;
     REALLOCATE (ibuffer, char, NBYTES + 2);
+    memset (&ibuffer[NBYTES - D_NBYTES], 0, NBYTES - D_NBYTES + 2);
   }
   Nbytes += nbytes;
@@ -419 +420 @@
       Ncpy = strlen (line);
       if (Nbytes + Ncpy >= NBYTES) {
+        int Nbytes_old = NBYTES;
         NBYTES = Nbytes + Ncpy + D_NBYTES;
         REALLOCATE (ibuffer, char, NBYTES + 2);
+        memset (&ibuffer[Nbytes_old], 0, NBYTES + 2 - Nbytes_old);
       }    
       memcpy (&ibuffer[Nbytes], line, Ncpy);
@@ -430 +433 @@
       Ncpy = strlen (line);
       if (Nbytes + Ncpy >= NBYTES) {
+        int Nbytes_old = NBYTES;
         NBYTES = Nbytes + Ncpy + D_NBYTES;
         REALLOCATE (ibuffer, char, NBYTES + 2);
+        memset (&ibuffer[Nbytes_old], 0, NBYTES + 2 - Nbytes_old);
       }    
       memcpy (&ibuffer[Nbytes], line, Ncpy);