tony2001 Mon Jan 24 09:12:01 2005 EDT
Modified files:
/php-src/ext/sysvmsg sysvmsg.c
Log:
fix msg_recieve() returning TRUE instead of FALSE when unserialize failed
(patch by Andrey Hristov)
http://cvs.php.net/diff.php/php-src/ext/sysvmsg/sysvmsg.c?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/sysvmsg/sysvmsg.c
diff -u php-src/ext/sysvmsg/sysvmsg.c:1.17 php-src/ext/sysvmsg/sysvmsg.c:1.18
--- php-src/ext/sysvmsg/sysvmsg.c:1.17 Tue Sep 28 19:10:39 2004
+++ php-src/ext/sysvmsg/sysvmsg.c Mon Jan 24 09:12:01 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvmsg.c,v 1.17 2004/09/28 23:10:39 helly Exp $ */
+/* $Id: sysvmsg.c,v 1.18 2005/01/24 14:12:01 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -142,7 +142,7 @@
{
php_info_print_table_start();
php_info_print_table_row(2, "sysvmsg support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.17 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.18 $");
php_info_print_table_end();
}
/* }}} */
@@ -330,6 +330,7 @@
/* got it! */
ZVAL_LONG(out_msgtype, messagebuffer->mtype);
+ RETVAL_TRUE;
if (do_unserialize) {
php_unserialize_data_t var_hash;
zval *tmp = NULL;
@@ -347,7 +348,6 @@
} else {
ZVAL_STRINGL(out_message, messagebuffer->mtext, result,
1);
}
- RETVAL_TRUE;
} else if (zerrcode) {
ZVAL_LONG(zerrcode, errno);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php