[Groff-commit] groff ChangeLog src/libs/libgroff/string.cpp sr...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     07/09/11 07:14:17

Modified files:
        .              : ChangeLog 
        src/libs/libgroff: string.cpp 
        src/preproc/tbl: table.cpp 

Log message:
        * src/libs/libgroff/string.cpp (string::remove_spaces): Fix memory
        allocation.
        
        * src/preproc/tbl/table.cpp (table::allocate): Initialize
        `blockflag' array.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1096&r2=1.1097
http://cvs.savannah.gnu.org/viewcvs/groff/src/libs/libgroff/string.cpp?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/tbl/table.cpp?cvsroot=groff&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1096
retrieving revision 1.1097
diff -u -b -r1.1096 -r1.1097
--- ChangeLog   10 Sep 2007 22:23:23 -0000      1.1096
+++ ChangeLog   11 Sep 2007 07:14:16 -0000      1.1097
@@ -1,3 +1,11 @@
+2007-09-11  Werner LEMBERG  <address@hidden>
+
+       * src/libs/libgroff/string.cpp (string::remove_spaces): Fix memory
+       allocation.
+
+       * src/preproc/tbl/table.cpp (table::allocate): Initialize
+       `blockflag' array.
+
 2007-09-10  Keith Marshall  <address@hidden>
 
        * README.MinGW: Add warnings about use of MSYS-RXVT, and about

Index: src/libs/libgroff/string.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/libs/libgroff/string.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/libs/libgroff/string.cpp        26 May 2005 21:02:00 -0000      1.2
+++ src/libs/libgroff/string.cpp        11 Sep 2007 07:14:16 -0000      1.3
@@ -309,7 +309,7 @@
   if (len - 1 != l) {
     if (l >= 0) {
       len = l + 1;
-      char *tmp = new char[len];
+      char *tmp = new char[sz];
       memcpy(tmp, p, len);
       a_delete ptr;
       ptr = tmp;

Index: src/preproc/tbl/table.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/tbl/table.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- src/preproc/tbl/table.cpp   12 Feb 2007 08:12:45 -0000      1.13
+++ src/preproc/tbl/table.cpp   11 Sep 2007 07:14:17 -0000      1.14
@@ -1339,6 +1339,8 @@
        entry = new PPtable_entry[allocated_rows];
        vline = new char*[allocated_rows];
        blockflag = new char[allocated_rows];
+       for (int i = 0; i < allocated_rows; i++)
+         blockflag[i] = 0;
       }
       else {
        table_entry ***old_entry = entry;
@@ -1356,6 +1358,8 @@
        char *old_blockflag = blockflag;
        blockflag = new char[allocated_rows];
        memcpy(blockflag, old_blockflag, sizeof(char)*old_allocated_rows);
+       for (int i = old_allocated_rows; i < allocated_rows; i++)
+         blockflag[i] = 0;
        a_delete old_blockflag;
       }
     }