2006-06-11 [colin] 2.2.3cvs12
authorColin Leroy <colin@colino.net>
Sun, 11 Jun 2006 13:36:35 +0000 (13:36 +0000)
committerColin Leroy <colin@colino.net>
Sun, 11 Jun 2006 13:36:35 +0000 (13:36 +0000)
* src/msgcache.c
Verify that g_malloc() succeeded

ChangeLog
PATCHSETS
configure.ac
src/msgcache.c

index ac6701d9ea1f5bb463380a55c4e69830a7726415..bf5186fcf582627ae3d2692e52b8f5785277b338 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-11 [colin]     2.2.3cvs12
+
+       * src/msgcache.c
+               Verify that g_malloc() succeeded
+
 2006-06-11 [colin]     2.2.3cvs11
 
        * src/wizard.c
index ed059e5aa056fb5791224fca1b7a1bf724f868b1..ef5780c95ba5e3943d1aecfdb9e61c87d23d9663 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.96.2.115 -r 1.96.2.116 src/textview.c;  ) > 2.2.3cvs9.patchset
 ( cvs diff -u -r 1.96.2.116 -r 1.96.2.117 src/textview.c;  ) > 2.2.3cvs10.patchset
 ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/wizard.c;  ) > 2.2.3cvs11.patchset
+( cvs diff -u -r 1.16.2.32 -r 1.16.2.33 src/msgcache.c;  ) > 2.2.3cvs12.patchset
index 9cc4e749ae935bb90ef0b59859d6c28de5655165..013c85d119dc5e09dab0ab6552e2f05df0a4db23 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index e9ab3f5495efec7a62403578c119e99fc4569e61..275d328410cb49661e765cb2dde4389cd9f95ee0 100644 (file)
@@ -374,6 +374,11 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str,
        }
        tmpstr = g_malloc(len + 1);
 
+       if(tmpstr == NULL) {
+               g_warning("read_data_str: can't g_malloc %d bytes\n", len);
+               return -1;
+       }
+
        if ((ni = fread(tmpstr, 1, len, fp)) != len) {
                g_warning("read_data_str: Cache data corrupted, read %d of %d "
                          "bytes at offset %ld\n",