andrey Sun Apr 10 17:37:18 2005 EDT
Modified files:
/php-src/ext/gd gd.c
/php-src/ext/dom document.c
Log:
fix memory corruption on 64bit in imagefttext(),
domdocument::load() and domdocument::loadxml()
http://cvs.php.net/diff.php/php-src/ext/gd/gd.c?r1=1.307&r2=1.308&ty=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.307 php-src/ext/gd/gd.c:1.308
--- php-src/ext/gd/gd.c:1.307 Sun Mar 27 18:43:51 2005
+++ php-src/ext/gd/gd.c Sun Apr 10 17:37:16 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.307 2005/03/27 23:43:51 pajoye Exp $ */
+/* $Id: gd.c,v 1.308 2005/04/10 21:37:16 andrey Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -3105,7 +3105,8 @@
{
zval *IM, *EXT = NULL;
gdImagePtr im=NULL;
- int col = -1, x = -1, y = -1, str_len, fontname_len, i, brect[8];
+ long col = -1, x = -1, y = -1;
+ int str_len, fontname_len, i, brect[8];
double ptsize, angle;
unsigned char *str = NULL, *fontname = NULL;
char *error = NULL;
http://cvs.php.net/diff.php/php-src/ext/dom/document.c?r1=1.64&r2=1.65&ty=u
Index: php-src/ext/dom/document.c
diff -u php-src/ext/dom/document.c:1.64 php-src/ext/dom/document.c:1.65
--- php-src/ext/dom/document.c:1.64 Sat Jan 8 08:24:39 2005
+++ php-src/ext/dom/document.c Sun Apr 10 17:37:17 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.64 2005/01/08 13:24:39 helly Exp $ */
+/* $Id: document.c,v 1.65 2005/04/10 21:37:17 andrey Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1548,7 +1548,8 @@
dom_doc_props *doc_prop;
dom_object *intern;
char *source;
- int source_len, refcount, ret, options = 0;
+ int source_len, refcount, ret;
+ long options = 0;
id = getThis();
if (id != NULL && ! instanceof_function(Z_OBJCE_P(id),
dom_document_class_entry TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
