cvs: /php4/ext/mhash mhash.c
| From: | Sascha Schumann | Date: | Sun, 14 Nov 1999 23:12:02 +0000 |
| Subject: | cvs: /php4/ext/mhash mhash.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-6229@lists.php.net to get a copy of this message | ||
sas Sun Nov 14 18:12:02 1999 EDT
Modified files:
/php4/ext/mhash mhash.c
Log:
(PHP mhash): don't segfault, if mhash_end() returns NULL
Index: php4/ext/mhash/mhash.c
diff -u php4/ext/mhash/mhash.c:1.8 php4/ext/mhash/mhash.c:1.9
--- php4/ext/mhash/mhash.c:1.8 Fri Sep 17 05:40:51 1999
+++ php4/ext/mhash/mhash.c Sun Nov 14 18:11:31 1999
@@ -134,9 +134,13 @@
hash_data = (unsigned char *) mhash_end(td);
- RETVAL_STRINGL(hash_data, bsize, 1);
+ if (hash_data) {
+ RETVAL_STRINGL(hash_data, bsize, 1);
- free(hash_data);
+ free(hash_data);
+ } else {
+ RETURN_FALSE;
+ }
}
#endif