iliaa Tue Jan 23 00:23:17 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/exif exif.c
Log:
emalloc() -> safe_emalloc()
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.10&r2=1.173.2.5.2.11&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.10
php-src/ext/exif/exif.c:1.173.2.5.2.11
--- php-src/ext/exif/exif.c:1.173.2.5.2.10 Tue Jan 9 17:55:29 2007
+++ php-src/ext/exif/exif.c Tue Jan 23 00:23:17 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.10 2007/01/09 17:55:29 helly Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.11 2007/01/23 00:23:17 iliaa Exp $ */
/* ToDos
*
@@ -139,7 +139,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.10 2007/01/09 17:55:29
helly Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.11 2007/01/23 00:23:17
iliaa Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -1606,7 +1606,7 @@
if (!size) {
data = NULL;
} else if (data == NULL) {
- data = emalloc(size);
+ data = safe_emalloc(size, 1, 0);
}
ImageInfo->file.list[count].type = type;
ImageInfo->file.list[count].data = data;
@@ -2383,7 +2383,7 @@
image_info_value *info_value;
byte_count = php_tiff_bytes_per_format[info_data->format] *
info_data->length;
- value_ptr = emalloc(max(byte_count, 4));
+ value_ptr = safe_emalloc(max(byte_count, 4), 1, 0);
memset(value_ptr, 0, 4);
if (!info_data->length) {
return value_ptr;
@@ -2875,7 +2875,7 @@
}
if (byte_count>sizeof(cbuf)) {
/* mark as outside range and get buffer */
- value_ptr = emalloc(byte_count);
+ value_ptr = safe_emalloc(byte_count, 1, 0);
outside = value_ptr;
} else {
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
