date:20080922

[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c /ext/spl/tests bug46088.phpt

2008-09-22 Thread Felipe Pena

felipe  Mon Sep 22 13:06:29 2008 UTC

  Added files: 
/php-src/ext/spl/tests  bug46088.phpt 

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  - Fixed bug #46088 (RegexIterator::accept - segfault)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.178&r2=1.179&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.178 
php-src/ext/spl/spl_iterators.c:1.179
--- php-src/ext/spl/spl_iterators.c:1.178   Tue Sep  9 19:43:52 2008
+++ php-src/ext/spl/spl_iterators.c Mon Sep 22 13:06:28 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.178 2008/09/09 19:43:52 lbarnaud Exp $ */
+/* $Id: spl_iterators.c,v 1.179 2008/09/22 13:06:28 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1746,6 +1746,10 @@
intsubject_len, use_copy, count, result_len;
zval   subject_copy, zcount, *replacement;
 
+   if (intern->current.data == NULL) {
+   RETURN_FALSE;
+   }
+
if (intern->u.regex.flags & REGIT_USE_KEY) {
if (intern->current.key_type == HASH_KEY_IS_LONG) {
subject_len = snprintf(tmp, sizeof(tmp), "%ld", 
intern->current.int_key);

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug46088.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug46088.phpt
+++ php-src/ext/spl/tests/bug46088.phpt
--TEST--
Bug #46088 (RegexIterator::accept - segfault)
--FILE--
accept());

?>
--EXPECT--
bool(false)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_iterators.c

2008-09-22 Thread Felipe Pena

felipe  Mon Sep 22 13:09:09 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/splspl_iterators.c 
  Log:
  - MFH: Fixed bug #46088 (RegexIterator::accept - segfault)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.28.2.14&r2=1.73.2.30.2.28.2.15&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.14 
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.15
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.28.2.14 Tue Sep  9 19:44:15 2008
+++ php-src/ext/spl/spl_iterators.c Mon Sep 22 13:09:09 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.14 2008/09/09 19:44:15 lbarnaud Exp 
$ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.28.2.15 2008/09/22 13:09:09 felipe Exp $ 
*/
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1689,7 +1689,11 @@
char   *subject, tmp[32], *result;
intsubject_len, use_copy, count, result_len;
zval   subject_copy, zcount, *replacement;
-
+   
+   if (intern->current.data == NULL) {
+   RETURN_FALSE;
+   }
+   
if (intern->u.regex.flags & REGIT_USE_KEY) {
if (intern->current.key_type == HASH_KEY_IS_LONG) {
subject_len = slprintf(tmp, sizeof(tmp), "%ld", 
intern->current.int_key);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests bug46088.phpt

2008-09-22 Thread Felipe Pena

felipe  Mon Sep 22 13:09:50 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/spl/tests  bug46088.phpt 
  Log:
  - New test
  

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug46088.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug46088.phpt
+++ php-src/ext/spl/tests/bug46088.phpt
--TEST--
Bug #46088 (RegexIterator::accept - segfault)
--FILE--
accept());

?>
--EXPECT--
bool(false)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_iterators.c /ext/spl/tests bug46088.phpt

2008-09-22 Thread Felipe Pena

felipe  Mon Sep 22 13:15:16 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/spl/tests  bug46088.phpt 

  Modified files:  
/php-src/ext/splspl_iterators.c 
  Log:
  - MFH: Fixed bug #46088 (RegexIterator::accept - segfault)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_iterators.c?r1=1.73.2.30.2.32&r2=1.73.2.30.2.33&diff_format=u
Index: php-src/ext/spl/spl_iterators.c
diff -u php-src/ext/spl/spl_iterators.c:1.73.2.30.2.32 
php-src/ext/spl/spl_iterators.c:1.73.2.30.2.33
--- php-src/ext/spl/spl_iterators.c:1.73.2.30.2.32  Tue Sep  9 19:44:25 2008
+++ php-src/ext/spl/spl_iterators.c Mon Sep 22 13:15:16 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_iterators.c,v 1.73.2.30.2.32 2008/09/09 19:44:25 lbarnaud Exp $ */
+/* $Id: spl_iterators.c,v 1.73.2.30.2.33 2008/09/22 13:15:16 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -1363,6 +1363,10 @@
intsubject_len, use_copy, count, result_len;
zval   subject_copy, zcount, *replacement;
 
+   if (intern->current.data == NULL) {
+   RETURN_FALSE;
+   }
+
if (intern->u.regex.flags & REGIT_USE_KEY) {
if (intern->current.key_type == HASH_KEY_IS_LONG) {
subject_len = slprintf(tmp, sizeof(tmp), "%ld", 
intern->current.int_key);

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug46088.phpt?view=markup&rev=1.1
Index: php-src/ext/spl/tests/bug46088.phpt
+++ php-src/ext/spl/tests/bug46088.phpt
--TEST--
Bug #46088 (RegexIterator::accept - segfault)
--FILE--
accept());

?>
--EXPECT--
bool(false)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

2008-09-22 Thread Felipe Pena

felipe  Mon Sep 22 13:17:58 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-srcNEWS 
  Log:
  - BFN #46088
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1230&r2=1.2027.2.547.2.1231&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1230 php-src/NEWS:1.2027.2.547.2.1231
--- php-src/NEWS:1.2027.2.547.2.1230Mon Sep 22 01:25:44 2008
+++ php-src/NEWSMon Sep 22 13:17:58 2008
@@ -18,8 +18,9 @@
   (Scott)
 - Fixed a crash on invalid method in ReflectionParameter constructor.
   (Christian Seiler)
-- Fixed Bug #46147 (after stream seek, appending stream filter reads incorrect 
data).
+- Fixed bug #46147 (after stream seek, appending stream filter reads incorrect 
data).
   (Greg)
+- Fixed bug #46088 (RegexIterator::accept - segfault). (Felipe)
 - Fixed bug #46059 (Compile failure under IRIX 6.5.30 building posix.c). 
   (Arnaud)
 - Fixed bug #46053 (SplFileObject::seek - Endless loop). (Arnaud)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/dom domconfiguration.c node.c

2008-09-22 Thread Rob Richards

rrichards   Mon Sep 22 15:09:07 2008 UTC

  Modified files:  
/php-src/ext/domdomconfiguration.c node.c 
  Log:
  fix hints causing phpdoc crash
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domconfiguration.c?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/dom/domconfiguration.c
diff -u php-src/ext/dom/domconfiguration.c:1.12 
php-src/ext/dom/domconfiguration.c:1.13
--- php-src/ext/dom/domconfiguration.c:1.12 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/domconfiguration.c  Mon Sep 22 15:09:06 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: domconfiguration.c,v 1.12 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: domconfiguration.c,v 1.13 2008/09/22 15:09:06 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,7 +31,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2)
ZEND_ARG_INFO(0, name)
-   ZEND_ARG_OBJ_INFO(0, value, DOMUserData, 0)
+   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
 static
@@ -42,7 +42,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_can_set_parameter, 0, 0, 0)
ZEND_ARG_INFO(0, name)
-   ZEND_ARG_OBJ_INFO(0, value, DOMUserData, 0)
+   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.62 php-src/ext/dom/node.c:1.63
--- php-src/ext/dom/node.c:1.62 Thu Aug 14 08:38:37 2008
+++ php-src/ext/dom/node.c  Mon Sep 22 15:09:06 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.62 2008/08/14 08:38:37 tony2001 Exp $ */
+/* $Id: node.c,v 1.63 2008/09/22 15:09:06 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -112,7 +112,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
ZEND_ARG_INFO(0, key)
-   ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+   ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, handler)
 ZEND_END_ARG_INFO();
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom domconfiguration.c node.c

2008-09-22 Thread Rob Richards

rrichards   Mon Sep 22 15:09:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/domdomconfiguration.c node.c 
  Log:
  MFH: fix hints causing phpdoc crash
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domconfiguration.c?r1=1.5.2.1.2.1.2.4&r2=1.5.2.1.2.1.2.5&diff_format=u
Index: php-src/ext/dom/domconfiguration.c
diff -u php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.4 
php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.5
--- php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.4  Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/domconfiguration.c  Mon Sep 22 15:09:46 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp 
$ */
+/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.5 2008/09/22 15:09:46 rrichards Exp 
$ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,7 +31,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2)
ZEND_ARG_INFO(0, name)
-   ZEND_ARG_OBJ_INFO(0, value, DOMUserData, 0)
+   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
 static
@@ -42,7 +42,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_can_set_parameter, 0, 0, 0)
ZEND_ARG_INFO(0, name)
-   ZEND_ARG_OBJ_INFO(0, value, DOMUserData, 0)
+   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.6&r2=1.37.2.3.2.8.2.7&diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.6 
php-src/ext/dom/node.c:1.37.2.3.2.8.2.7
--- php-src/ext/dom/node.c:1.37.2.3.2.8.2.6 Thu Aug 14 08:39:04 2008
+++ php-src/ext/dom/node.c  Mon Sep 22 15:09:46 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.8.2.6 2008/08/14 08:39:04 tony2001 Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.8.2.7 2008/09/22 15:09:46 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -112,7 +112,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
ZEND_ARG_INFO(0, key)
-   ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+   ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, handler)
 ZEND_END_ARG_INFO();
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom domconfiguration.c node.c

2008-09-22 Thread Rob Richards

rrichards   Mon Sep 22 15:10:24 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/domdomconfiguration.c node.c 
  Log:
  MFH: fix hints causing phpdoc crash
  
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domconfiguration.c?r1=1.5.2.1.2.3&r2=1.5.2.1.2.4&diff_format=u
Index: php-src/ext/dom/domconfiguration.c
diff -u php-src/ext/dom/domconfiguration.c:1.5.2.1.2.3 
php-src/ext/dom/domconfiguration.c:1.5.2.1.2.4
--- php-src/ext/dom/domconfiguration.c:1.5.2.1.2.3  Mon Feb  4 15:23:10 2008
+++ php-src/ext/dom/domconfiguration.c  Mon Sep 22 15:10:24 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: domconfiguration.c,v 1.5.2.1.2.3 2008/02/04 15:23:10 sebastian Exp $ */
+/* $Id: domconfiguration.c,v 1.5.2.1.2.4 2008/09/22 15:10:24 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -32,7 +32,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2)
ZEND_ARG_INFO(0, name)
-   ZEND_ARG_OBJ_INFO(0, value, DOMUserData, 0)
+   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 
 static
@@ -43,7 +43,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_can_set_parameter, 0, 0, 0)
ZEND_ARG_INFO(0, name)
-   ZEND_ARG_OBJ_INFO(0, value, DOMUserData, 0)
+   ZEND_ARG_INFO(0, value)
 ZEND_END_ARG_INFO();
 /* }}} */
 
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.11&r2=1.37.2.3.2.12&diff_format=u
Index: php-src/ext/dom/node.c
diff -u php-src/ext/dom/node.c:1.37.2.3.2.11 
php-src/ext/dom/node.c:1.37.2.3.2.12
--- php-src/ext/dom/node.c:1.37.2.3.2.11Wed Jan 30 06:48:20 2008
+++ php-src/ext/dom/node.c  Mon Sep 22 15:10:24 2008
@@ -17,7 +17,7 @@
+--+
 */
 
-/* $Id: node.c,v 1.37.2.3.2.11 2008/01/30 06:48:20 sebastian Exp $ */
+/* $Id: node.c,v 1.37.2.3.2.12 2008/09/22 15:10:24 rrichards Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -112,7 +112,7 @@
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_node_set_user_data, 0, 0, 3)
ZEND_ARG_INFO(0, key)
-   ZEND_ARG_OBJ_INFO(0, data, DOMUserData, 0)
+   ZEND_ARG_INFO(0, data)
ZEND_ARG_INFO(0, handler)
 ZEND_END_ARG_INFO();
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/gd gd.c

2008-09-22 Thread Rob Richards

rrichards   Mon Sep 22 15:30:59 2008 UTC

  Modified files:  
/php-src/ext/gd gd.c 
  Log:
  sz is long not zval**
  
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.393&r2=1.394&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.393 php-src/ext/gd/gd.c:1.394
--- php-src/ext/gd/gd.c:1.393   Fri Aug 29 11:09:05 2008
+++ php-src/ext/gd/gd.c Mon Sep 22 15:30:59 2008
@@ -18,7 +18,7 @@
+--+
  */
 
-/* $Id: gd.c,v 1.393 2008/08/29 11:09:05 pajoye Exp $ */
+/* $Id: gd.c,v 1.394 2008/09/22 15:30:59 rrichards Exp $ */
 
 /* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -4231,10 +4231,10 @@
/*
printf("%d %d %d %d\n", str_bbox.llx, str_bbox.lly, str_bbox.urx, 
str_bbox.ury);
*/
-   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.llx)*Z_LVAL_PP(sz)/1000));
-   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.lly)*Z_LVAL_PP(sz)/1000));
-   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.urx)*Z_LVAL_PP(sz)/1000));
-   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.ury)*Z_LVAL_PP(sz)/1000));
+   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.llx)*sz/1000));
+   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.lly)*sz/1000));
+   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.urx)*sz/1000));
+   add_next_index_long(return_value, (int) ceil(((double) 
str_bbox.ury)*sz/1000));
 }
 /* }}} */
 #endif



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src /ext/spl spl_iterators.c /ext/spl/tests bug46088.phpt

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl spl_iterators.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/spl/tests bug46088.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/spl spl_iterators.c /ext/spl/tests bug46088.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) / NEWS

[PHP-CVS] cvs: php-src /ext/dom domconfiguration.c node.c

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/dom domconfiguration.c node.c

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/dom domconfiguration.c node.c

[PHP-CVS] cvs: php-src /ext/gd gd.c

9 matches

Site Navigation

Mail list logo

Footer information