diff options
| author | Andrey Hristov <andrey@php.net> | 2005-04-10 21:37:17 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2005-04-10 21:37:17 +0000 |
| commit | d9f5f1ee08d1107b5cf0026030b25d2d67c917b7 (patch) | |
| tree | c179705fa09986283940569427e1d8a1c23c14e1 /ext | |
| parent | 628b8cae7d52c4b4ae2604225788fe4e07a7d541 (diff) | |
| download | php-git-d9f5f1ee08d1107b5cf0026030b25d2d67c917b7.tar.gz | |
fix memory corruption on 64bit in imagefttext(),
domdocument::load() and domdocument::loadxml()
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/dom/document.c | 3 | ||||
| -rw-r--r-- | ext/gd/gd.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/dom/document.c b/ext/dom/document.c index 1522565f00..18c89d0926 100644 --- a/ext/dom/document.c +++ b/ext/dom/document.c @@ -1548,7 +1548,8 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) { 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)) { diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 22879ae6fb..135c2dcc6a 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -3105,7 +3105,8 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int { 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; |