helly Sun May 21 13:25:16 2006 UTC
Modified files:
/php-src/ext/standard base64.c
Log:
- Drop unneccesary check and change to safe_emalloc
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/base64.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/ext/standard/base64.c
diff -u php-src/ext/standard/base64.c:1.46 php-src/ext/standard/base64.c:1.47
--- php-src/ext/standard/base64.c:1.46 Thu Mar 2 13:12:45 2006
+++ php-src/ext/standard/base64.c Sun May 21 13:25:16 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: base64.c,v 1.46 2006/03/02 13:12:45 dmitry Exp $ */
+/* $Id: base64.c,v 1.47 2006/05/21 13:25:16 helly Exp $ */
#include <string.h>
@@ -144,10 +144,7 @@
/* this sucks for threaded environments */
unsigned char *result;
- result = (unsigned char *)emalloc(length + 1);
- if (result == NULL) {
- return NULL;
- }
+ result = (unsigned char *)safe_emalloc(length, 1, 1);
/* run through the whole string, converting as we go */
while ((ch = *current++) != '\0' && length-- > 0) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
