date:20081006

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

2008-10-06 Thread changelog

changelog   Tue Oct  7 01:32:11 2008 UTC

  Modified files:  
/php-srcChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/php-src/ChangeLog?r1=1.3190r2=1.3191diff_format=u
Index: php-src/ChangeLog
diff -u php-src/ChangeLog:1.3190 php-src/ChangeLog:1.3191
--- php-src/ChangeLog:1.3190Mon Oct  6 01:32:11 2008
+++ php-src/ChangeLog   Tue Oct  7 01:32:10 2008
@@ -1,3 +1,90 @@
+2008-10-06  Kalle Sommer Nielsen  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/mssql/php_mssql.c:
+  MFH:
+  * is_output and is_null parameters are now booleans instead of int in
+  mssql_bind
+  * Added missing conditional from old parameter parsing
+
+* ext/mssql/php_mssql.c:
+  - is_output and is_null parameters are now booleans instead of int in
+  mssql_bind
+  * Added missing conditional from old parameter parsing
+
+2008-10-06  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  ext/gd/gd.c:
+  Removed deprecated usage of zend_get_parameters_ex()
+
+2008-10-06  Felipe Pena  [EMAIL PROTECTED]
+
+* ext/interbase/ibase_service.c:
+  - Fixed compiler warning
+
+* (PHP_5_2)
+  NEWS:
+  - BFN #45373
+
+* (PHP_5_2)
+  ext/interbase/ibase_query.c
+  ext/interbase/ibase_query.c
+  ext/interbase/tests/bug45373.phpt
+  ext/interbase/tests/bug45373.phpt:
+  - MFH: Fixed bug #45373 (php crash on query with errors in params)
+
+* ext/interbase/ibase_query.c
+  ext/interbase/tests/bug45373.phpt
+  ext/interbase/tests/bug45373.phpt
+  ext/interbase/tests/bug45373.phpt:
+  - Fixed bug #45373 (php crash on query with errors in params)
+
+2008-10-06  Derick Rethans  [EMAIL PROTECTED]
+
+* ext/date/lib/timezonedb.h
+  ext/date/lib/timezonedb.h
+  ext/date/lib/timezonedb.h:
+  - Updated to version 2008.7 (2008g)
+
+2008-10-06  Etienne Kneuss  [EMAIL PROTECTED]
+
+* (PHP_5_2)
+  ext/spl/spl_array.c
+  ext/spl/tests/bug46115.phpt:
+  MFH: bug #46115 (Fixes nothing in 5.2, but sync code)
+
+2008-10-06  Ilia Alshanetsky  [EMAIL PROTECTED]
+
+* ext/imap/php_imap.c:
+  
+  MFB: Fixed a few signedness warnings
+
+* (PHP_5_3)
+  ext/imap/php_imap.c:
+  Fixed a few signedness warnings
+
+2008-10-06  Felipe Pena  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  NEWS
+  ZendEngine2/zend_vm_def.h
+  ZendEngine2/zend_vm_execute.h
+  ZendEngine2/tests/bug46238.phpt:
+  - MFH: Fixed bug #46238 (Segmentation fault on static call with empty
+  string method)
+
+* ZendEngine2/tests/bug46238.phpt
+  ZendEngine2/tests/bug46238.phpt:
+  
+  - Fixed bug #46238 (Segmentation fault on static call with empty string
+  method)
+
+* ZendEngine2/zend_vm_def.h
+  ZendEngine2/zend_vm_execute.h:
+  - Fixed bug #46238 (Segmentation fault on static call with empty string
+  method)
+
 2008-10-05  Etienne Kneuss  [EMAIL PROTECTED]
 
 * (PHP_5_3)
@@ -7125,7 +7212,7 @@
 
 * sapi/litespeed/lsapi_main.c
   sapi/litespeed/lsapilib.c:
-  - Added missing $Id: ChangeLog,v 1.3190 2008/10/06 01:32:11 changelog 
Exp $ tags and nuked c++ comments
+  - Added missing $Id: ChangeLog,v 1.3191 2008/10/07 01:32:10 changelog 
Exp $ tags and nuked c++ comments
 
 * (PHP_5_3)
   ext/intl/locale/locale.c

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

2008-10-06 Thread changelog

changelog   Tue Oct  7 01:32:15 2008 UTC

  Modified files:  
/ZendEngine2ChangeLog 
  Log:
  ChangeLog update
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/ChangeLog?r1=1.1380r2=1.1381diff_format=u
Index: ZendEngine2/ChangeLog
diff -u ZendEngine2/ChangeLog:1.1380 ZendEngine2/ChangeLog:1.1381
--- ZendEngine2/ChangeLog:1.1380Fri Oct  3 01:31:55 2008
+++ ZendEngine2/ChangeLog   Tue Oct  7 01:32:15 2008
@@ -1,3 +1,23 @@
+2008-10-06  Felipe Pena  [EMAIL PROTECTED]
+
+* (PHP_5_3)
+  zend_vm_def.h
+  zend_vm_execute.h
+  tests/bug46238.phpt:
+  - MFH: Fixed bug #46238 (Segmentation fault on static call with empty
+  string method)
+
+* tests/bug46238.phpt
+  tests/bug46238.phpt:
+  
+  - Fixed bug #46238 (Segmentation fault on static call with empty string
+  method)
+
+* zend_vm_def.h
+  zend_vm_execute.h:
+  - Fixed bug #46238 (Segmentation fault on static call with empty string
+  method)
+
 2008-10-02  Etienne Kneuss  [EMAIL PROTECTED]
 
 * (PHP_5_3)
@@ -26069,7 +26089,7 @@
 2003-06-10  Jani Taskinen  [EMAIL PROTECTED]
 
 * zend_multiply.h:
-  - Missing $Id: ChangeLog,v 1.1380 2008/10/03 01:31:55 changelog Exp $ tag
+  - Missing $Id: ChangeLog,v 1.1381 2008/10/07 01:32:15 changelog Exp $ tag
 
 2003-06-10  James Cox  [EMAIL PROTECTED]
 
@@ -27793,7 +27813,7 @@
   zend_types.h
   zend_variables.c
   zend_variables.h:
-  - Added some missing CVS $Id: ChangeLog,v 1.1380 2008/10/03 01:31:55 
changelog Exp $ tags, headers and footers.
+  - Added some missing CVS $Id: ChangeLog,v 1.1381 2008/10/07 01:32:15 
changelog Exp $ tags, headers and footers.
 
 2003-01-30  Ilia Alshanetsky  [EMAIL PROTECTED]

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

2008-10-06 Thread Etienne Kneuss

colder  Mon Oct  6 13:45:42 2008 UTC

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

  Modified files:  
/php-src/ext/splspl_array.c 
  Log:
  MFH: bug #46115 (Fixes nothing in 5.2, but sync code)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_array.c?r1=1.71.2.17.2.17r2=1.71.2.17.2.18diff_format=u
Index: php-src/ext/spl/spl_array.c
diff -u php-src/ext/spl/spl_array.c:1.71.2.17.2.17 
php-src/ext/spl/spl_array.c:1.71.2.17.2.18
--- php-src/ext/spl/spl_array.c:1.71.2.17.2.17  Sun Oct  5 14:49:25 2008
+++ php-src/ext/spl/spl_array.c Mon Oct  6 13:45:42 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: spl_array.c,v 1.71.2.17.2.17 2008/10/05 14:49:25 colder Exp $ */
+/* $Id: spl_array.c,v 1.71.2.17.2.18 2008/10/06 13:45:42 colder Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include config.h
@@ -1197,6 +1197,7 @@
spl_array_object *intern = 
(spl_array_object*)zend_object_store_get_object(getThis() TSRMLS_CC);
HashTable *aht = spl_array_get_hash_table(intern, 0 TSRMLS_CC);
zval tmp, *arg;
+   zval *retval_ptr = NULL;

INIT_PZVAL(tmp);
Z_TYPE(tmp) = IS_ARRAY;
@@ -1207,9 +1208,12 @@
zend_throw_exception(spl_ce_BadMethodCallException, 
Function expects exactly one argument, 0 TSRMLS_CC);
return;
}
-   zend_call_method(NULL, NULL, NULL, fname, fname_len, 
return_value_ptr, 2, tmp, arg TSRMLS_CC);
+   zend_call_method(NULL, NULL, NULL, fname, fname_len, 
retval_ptr, 2, tmp, arg TSRMLS_CC);
} else {
-   zend_call_method(NULL, NULL, NULL, fname, fname_len, 
return_value_ptr, 1, tmp, NULL TSRMLS_CC);
+   zend_call_method(NULL, NULL, NULL, fname, fname_len, 
retval_ptr, 1, tmp, NULL TSRMLS_CC);
+   }
+   if (retval_ptr) {
+   COPY_PZVAL_TO_ZVAL(*return_value, retval_ptr);
}
 }
 

http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug46115.phpt?view=markuprev=1.1
Index: php-src/ext/spl/tests/bug46115.phpt
+++ php-src/ext/spl/tests/bug46115.phpt



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

Re: [PHP-CVS] cvs: php-src /ext/msql php_msql.c

2008-10-06 Thread Antony Dovgal

On 03.10.2008 21:18, Felipe Pena wrote:
 felipeFri Oct  3 17:18:31 2008 UTC
 
   Modified files:  
 /php-src/ext/msql php_msql.c 
   Log:
   - Fixed:
- Some segfaults when no connection is open
- Warning about cfg_get_long (Kalle)
   - New parameter parsing API

ext/msql should have been moved to PECL (and declared 
dead/unused/unrecommended) ages ago.

-- 
Wbr, 
Antony Dovgal

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

[PHP-CVS] cvs: php-src /ext/date/lib timezonedb.h

2008-10-06 Thread Derick Rethans

derick  Mon Oct  6 14:27:33 2008 UTC

  Modified files:  
/php-src/ext/date/lib   timezonedb.h 
  Log:
  - Updated to version 2008.7 (2008g)
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.33 
php-src/ext/date/lib/timezonedb.h:1.34
--- php-src/ext/date/lib/timezonedb.h:1.33  Mon Sep 15 18:02:49 2008
+++ php-src/ext/date/lib/timezonedb.h   Mon Oct  6 14:27:33 2008
@@ -2380,20 +2380,20 @@
 0x41, 0x87, 0x06, 0x40, 0x42, 0x17, 0xFD, 0x30, 0x43, 0x51, 0xD0, 0x40, 0x43, 
0xF7, 0xDF, 0x30, 
 0x45, 0x4D, 0x61, 0xC0, 0x45, 0xE0, 0xFB, 0xB0, 0x47, 0x11, 0x94, 0x40, 0x47, 
0xB7, 0xA3, 0x30, 
 0x48, 0xFA, 0xB0, 0xC0, 0x49, 0x97, 0x85, 0x30, 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 
0x80, 0xA1, 0xB0, 
-0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x60, 0x83, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 
0x40, 0x65, 0xB0, 
+0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x60, 0x83, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 
0x49, 0xA0, 0x30, 
 0x50, 0x83, 0x73, 0x40, 0x51, 0x20, 0x47, 0xB0, 0x52, 0x63, 0x55, 0x40, 0x53, 
0x00, 0x29, 0xB0, 
-0x54, 0x43, 0x37, 0x40, 0x54, 0xE0, 0x0B, 0xB0, 0x56, 0x23, 0x19, 0x40, 0x56, 
0xC9, 0x28, 0x30, 
+0x54, 0x43, 0x37, 0x40, 0x54, 0xE9, 0x46, 0x30, 0x56, 0x23, 0x19, 0x40, 0x56, 
0xC9, 0x28, 0x30, 
 0x58, 0x02, 0xFB, 0x40, 0x58, 0xA9, 0x0A, 0x30, 0x59, 0xE2, 0xDD, 0x40, 0x5A, 
0x88, 0xEC, 0x30, 
 0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 0x68, 0xCE, 0x30, 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 
0x48, 0xB0, 0x30, 
 0x5F, 0x8B, 0xBD, 0xC0, 0x60, 0x31, 0xCC, 0xB0, 0x61, 0x6B, 0x9F, 0xC0, 0x62, 
0x11, 0xAE, 0xB0, 
-0x63, 0x4B, 0x81, 0xC0, 0x63, 0xF1, 0x90, 0xB0, 0x65, 0x2B, 0x63, 0xC0, 0x65, 
0xD1, 0x72, 0xB0, 
-0x67, 0x14, 0x80, 0x40, 0x67, 0xB1, 0x54, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 
0x91, 0x36, 0xB0, 
+0x63, 0x4B, 0x81, 0xC0, 0x63, 0xFA, 0xCB, 0x30, 0x65, 0x2B, 0x63, 0xC0, 0x65, 
0xD1, 0x72, 0xB0, 
+0x67, 0x14, 0x80, 0x40, 0x67, 0xB1, 0x54, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 
0x9A, 0x71, 0x30, 
 0x6A, 0xD4, 0x44, 0x40, 0x6B, 0x7A, 0x53, 0x30, 0x6C, 0xB4, 0x26, 0x40, 0x6D, 
0x5A, 0x35, 0x30, 
 0x6E, 0x94, 0x08, 0x40, 0x6F, 0x3A, 0x17, 0x30, 0x70, 0x7D, 0x24, 0xC0, 0x71, 
0x19, 0xF9, 0x30, 
 0x72, 0x5D, 0x06, 0xC0, 0x72, 0xF9, 0xDB, 0x30, 0x74, 0x3C, 0xE8, 0xC0, 0x74, 
0xD9, 0xBD, 0x30, 
-0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xC2, 0xD9, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 
0xA2, 0xBB, 0xB0, 
+0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xC2, 0xD9, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 
0xAB, 0xF6, 0x30, 
 0x79, 0xDC, 0x8E, 0xC0, 0x7A, 0x82, 0x9D, 0xB0, 0x7B, 0xC5, 0xAB, 0x40, 0x7C, 
0x62, 0x7F, 0xB0, 
-0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x42, 0x61, 0xB0, 0x7F, 0x85, 0x6F, 0x40, 0x02, 
0x01, 0x02, 0x01, 
+0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x4B, 0x9C, 0x30, 0x7F, 0x85, 0x6F, 0x40, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
@@ -2734,19 +2734,19 @@
 0x43, 0x51, 0xD0, 0x40, 0x43, 0xF7, 0xDF, 0x30, 0x45, 0x4D, 0x61, 0xC0, 0x45, 
0xE0, 0xFB, 0xB0, 
 0x47, 0x11, 0x94, 0x40, 0x47, 0xB7, 0xA3, 0x30, 0x48, 0xFA, 0xB0, 0xC0, 0x49, 
0x97, 0x85, 0x30, 
 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 0x80, 0xA1, 0xB0, 0x4C, 0xBA, 0x74, 0xC0, 0x4D, 
0x60, 0x83, 0xB0, 
-0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x40, 0x65, 0xB0, 0x50, 0x83, 0x73, 0x40, 0x51, 
0x20, 0x47, 0xB0, 
-0x52, 0x63, 0x55, 0x40, 0x53, 0x00, 0x29, 0xB0, 0x54, 0x43, 0x37, 0x40, 0x54, 
0xE0, 0x0B, 0xB0, 
+0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x49, 0xA0, 0x30, 0x50, 0x83, 0x73, 0x40, 0x51, 
0x20, 0x47, 0xB0, 
+0x52, 0x63, 0x55, 0x40, 0x53, 0x00, 0x29, 0xB0, 0x54, 0x43, 0x37, 0x40, 0x54, 
0xE9, 0x46, 0x30, 
 0x56, 0x23, 0x19, 0x40, 0x56, 0xC9, 0x28, 0x30, 0x58, 0x02, 0xFB, 0x40, 0x58, 
0xA9, 0x0A, 0x30, 
 0x59, 0xE2, 0xDD, 0x40, 0x5A, 0x88, 0xEC, 0x30, 0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 
0x68, 0xCE, 0x30, 
 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 0x48, 0xB0, 0x30, 0x5F, 0x8B, 0xBD, 0xC0, 0x60, 
0x31, 0xCC, 0xB0, 
-0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x11, 0xAE, 0xB0, 0x63, 0x4B, 0x81, 0xC0, 0x63, 
0xF1, 0x90, 0xB0, 
+0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x11, 0xAE, 0xB0, 0x63, 0x4B, 0x81, 0xC0, 0x63, 
0xFA, 0xCB, 0x30, 
 0x65, 0x2B, 0x63, 0xC0, 0x65, 0xD1, 0x72, 0xB0, 0x67, 0x14, 0x80, 0x40, 0x67, 
0xB1, 0x54, 0xB0, 
-0x68, 0xF4, 0x62, 0x40, 0x69, 0x91, 0x36, 0xB0, 0x6A, 0xD4, 0x44, 0x40, 0x6B, 
0x7A, 0x53, 0x30, 
+0x68, 0xF4, 0x62, 0x40, 0x69, 0x9A, 0x71, 0x30, 0x6A, 0xD4, 0x44, 0x40, 0x6B, 
0x7A, 0x53, 0x30, 
 0x6C, 0xB4, 0x26, 0x40, 0x6D, 0x5A, 0x35, 0x30, 0x6E, 0x94, 0x08, 0x40, 0x6F, 
0x3A, 0x17, 0x30, 
 0x70, 0x7D, 0x24, 0xC0, 0x71, 0x19, 0xF9, 0x30, 0x72, 0x5D, 0x06, 0xC0, 0x72, 
0xF9, 0xDB, 0x30, 
 0x74, 0x3C, 0xE8, 0xC0, 0x74, 0xD9, 0xBD, 0x30, 0x76, 0x1C, 0xCA, 0xC0, 0x76, 
0xC2, 0xD9, 0xB0, 
-0x77, 0xFC, 0xAC, 0xC0, 0x78, 0xA2, 0xBB, 0xB0, 0x79, 0xDC,

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib timezonedb.h

2008-10-06 Thread Derick Rethans

derick  Mon Oct  6 14:27:44 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/date/lib   timezonedb.h 
  Log:
  - Updated to version 2008.7 (2008g)
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.10.2.11r2=1.4.2.7.2.10.2.12diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.11 
php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.12
--- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.10.2.11 Mon Sep 15 18:02:58 2008
+++ php-src/ext/date/lib/timezonedb.h   Mon Oct  6 14:27:41 2008
@@ -2380,20 +2380,20 @@
 0x41, 0x87, 0x06, 0x40, 0x42, 0x17, 0xFD, 0x30, 0x43, 0x51, 0xD0, 0x40, 0x43, 
0xF7, 0xDF, 0x30, 
 0x45, 0x4D, 0x61, 0xC0, 0x45, 0xE0, 0xFB, 0xB0, 0x47, 0x11, 0x94, 0x40, 0x47, 
0xB7, 0xA3, 0x30, 
 0x48, 0xFA, 0xB0, 0xC0, 0x49, 0x97, 0x85, 0x30, 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 
0x80, 0xA1, 0xB0, 
-0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x60, 0x83, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 
0x40, 0x65, 0xB0, 
+0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x60, 0x83, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 
0x49, 0xA0, 0x30, 
 0x50, 0x83, 0x73, 0x40, 0x51, 0x20, 0x47, 0xB0, 0x52, 0x63, 0x55, 0x40, 0x53, 
0x00, 0x29, 0xB0, 
-0x54, 0x43, 0x37, 0x40, 0x54, 0xE0, 0x0B, 0xB0, 0x56, 0x23, 0x19, 0x40, 0x56, 
0xC9, 0x28, 0x30, 
+0x54, 0x43, 0x37, 0x40, 0x54, 0xE9, 0x46, 0x30, 0x56, 0x23, 0x19, 0x40, 0x56, 
0xC9, 0x28, 0x30, 
 0x58, 0x02, 0xFB, 0x40, 0x58, 0xA9, 0x0A, 0x30, 0x59, 0xE2, 0xDD, 0x40, 0x5A, 
0x88, 0xEC, 0x30, 
 0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 0x68, 0xCE, 0x30, 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 
0x48, 0xB0, 0x30, 
 0x5F, 0x8B, 0xBD, 0xC0, 0x60, 0x31, 0xCC, 0xB0, 0x61, 0x6B, 0x9F, 0xC0, 0x62, 
0x11, 0xAE, 0xB0, 
-0x63, 0x4B, 0x81, 0xC0, 0x63, 0xF1, 0x90, 0xB0, 0x65, 0x2B, 0x63, 0xC0, 0x65, 
0xD1, 0x72, 0xB0, 
-0x67, 0x14, 0x80, 0x40, 0x67, 0xB1, 0x54, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 
0x91, 0x36, 0xB0, 
+0x63, 0x4B, 0x81, 0xC0, 0x63, 0xFA, 0xCB, 0x30, 0x65, 0x2B, 0x63, 0xC0, 0x65, 
0xD1, 0x72, 0xB0, 
+0x67, 0x14, 0x80, 0x40, 0x67, 0xB1, 0x54, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 
0x9A, 0x71, 0x30, 
 0x6A, 0xD4, 0x44, 0x40, 0x6B, 0x7A, 0x53, 0x30, 0x6C, 0xB4, 0x26, 0x40, 0x6D, 
0x5A, 0x35, 0x30, 
 0x6E, 0x94, 0x08, 0x40, 0x6F, 0x3A, 0x17, 0x30, 0x70, 0x7D, 0x24, 0xC0, 0x71, 
0x19, 0xF9, 0x30, 
 0x72, 0x5D, 0x06, 0xC0, 0x72, 0xF9, 0xDB, 0x30, 0x74, 0x3C, 0xE8, 0xC0, 0x74, 
0xD9, 0xBD, 0x30, 
-0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xC2, 0xD9, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 
0xA2, 0xBB, 0xB0, 
+0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xC2, 0xD9, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 
0xAB, 0xF6, 0x30, 
 0x79, 0xDC, 0x8E, 0xC0, 0x7A, 0x82, 0x9D, 0xB0, 0x7B, 0xC5, 0xAB, 0x40, 0x7C, 
0x62, 0x7F, 0xB0, 
-0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x42, 0x61, 0xB0, 0x7F, 0x85, 0x6F, 0x40, 0x02, 
0x01, 0x02, 0x01, 
+0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x4B, 0x9C, 0x30, 0x7F, 0x85, 0x6F, 0x40, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
@@ -2734,19 +2734,19 @@
 0x43, 0x51, 0xD0, 0x40, 0x43, 0xF7, 0xDF, 0x30, 0x45, 0x4D, 0x61, 0xC0, 0x45, 
0xE0, 0xFB, 0xB0, 
 0x47, 0x11, 0x94, 0x40, 0x47, 0xB7, 0xA3, 0x30, 0x48, 0xFA, 0xB0, 0xC0, 0x49, 
0x97, 0x85, 0x30, 
 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 0x80, 0xA1, 0xB0, 0x4C, 0xBA, 0x74, 0xC0, 0x4D, 
0x60, 0x83, 0xB0, 
-0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x40, 0x65, 0xB0, 0x50, 0x83, 0x73, 0x40, 0x51, 
0x20, 0x47, 0xB0, 
-0x52, 0x63, 0x55, 0x40, 0x53, 0x00, 0x29, 0xB0, 0x54, 0x43, 0x37, 0x40, 0x54, 
0xE0, 0x0B, 0xB0, 
+0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x49, 0xA0, 0x30, 0x50, 0x83, 0x73, 0x40, 0x51, 
0x20, 0x47, 0xB0, 
+0x52, 0x63, 0x55, 0x40, 0x53, 0x00, 0x29, 0xB0, 0x54, 0x43, 0x37, 0x40, 0x54, 
0xE9, 0x46, 0x30, 
 0x56, 0x23, 0x19, 0x40, 0x56, 0xC9, 0x28, 0x30, 0x58, 0x02, 0xFB, 0x40, 0x58, 
0xA9, 0x0A, 0x30, 
 0x59, 0xE2, 0xDD, 0x40, 0x5A, 0x88, 0xEC, 0x30, 0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 
0x68, 0xCE, 0x30, 
 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 0x48, 0xB0, 0x30, 0x5F, 0x8B, 0xBD, 0xC0, 0x60, 
0x31, 0xCC, 0xB0, 
-0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x11, 0xAE, 0xB0, 0x63, 0x4B, 0x81, 0xC0, 0x63, 
0xF1, 0x90, 0xB0, 
+0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x11, 0xAE, 0xB0, 0x63, 0x4B, 0x81, 0xC0, 0x63, 
0xFA, 0xCB, 0x30, 
 0x65, 0x2B, 0x63, 0xC0, 0x65, 0xD1, 0x72, 0xB0, 0x67, 0x14, 0x80, 0x40, 0x67, 
0xB1, 0x54, 0xB0, 
-0x68, 0xF4, 0x62, 0x40, 0x69, 0x91, 0x36, 0xB0, 0x6A, 0xD4, 0x44, 0x40, 0x6B, 
0x7A, 0x53, 0x30, 
+0x68, 0xF4, 0x62, 0x40, 0x69, 0x9A, 0x71, 0x30, 0x6A, 0xD4, 0x44, 0x40, 0x6B, 
0x7A, 0x53, 0x30, 
 0x6C, 0xB4, 0x26, 0x40, 0x6D, 0x5A, 0x35, 0x30, 0x6E, 0x94, 0x08, 0x40, 0x6F, 
0x3A, 0x17, 0x30, 
 0x70, 0x7D, 0x24, 0xC0, 0x71, 0x19, 0xF9, 0x30, 0x72, 0x5D, 0x06, 0xC0, 0x72, 
0xF9, 0xDB, 0x30, 
 0x74, 0x3C, 0xE8, 0xC0, 0x74, 0xD9, 0xBD, 0x30, 0x76, 0x1C, 0xCA, 0xC0, 0x76, 
0xC2,

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/lib timezonedb.h

2008-10-06 Thread Derick Rethans

derick  Mon Oct  6 14:27:54 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/date/lib   timezonedb.h 
  Log:
  - Updated to version 2008.7 (2008g)
  http://cvs.php.net/viewvc.cgi/php-src/ext/date/lib/timezonedb.h?r1=1.4.2.7.2.21r2=1.4.2.7.2.22diff_format=u
Index: php-src/ext/date/lib/timezonedb.h
diff -u php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.21 
php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.22
--- php-src/ext/date/lib/timezonedb.h:1.4.2.7.2.21  Mon Sep 15 18:03:10 2008
+++ php-src/ext/date/lib/timezonedb.h   Mon Oct  6 14:27:51 2008
@@ -2380,20 +2380,20 @@
 0x41, 0x87, 0x06, 0x40, 0x42, 0x17, 0xFD, 0x30, 0x43, 0x51, 0xD0, 0x40, 0x43, 
0xF7, 0xDF, 0x30, 
 0x45, 0x4D, 0x61, 0xC0, 0x45, 0xE0, 0xFB, 0xB0, 0x47, 0x11, 0x94, 0x40, 0x47, 
0xB7, 0xA3, 0x30, 
 0x48, 0xFA, 0xB0, 0xC0, 0x49, 0x97, 0x85, 0x30, 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 
0x80, 0xA1, 0xB0, 
-0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x60, 0x83, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 
0x40, 0x65, 0xB0, 
+0x4C, 0xBA, 0x74, 0xC0, 0x4D, 0x60, 0x83, 0xB0, 0x4E, 0x9A, 0x56, 0xC0, 0x4F, 
0x49, 0xA0, 0x30, 
 0x50, 0x83, 0x73, 0x40, 0x51, 0x20, 0x47, 0xB0, 0x52, 0x63, 0x55, 0x40, 0x53, 
0x00, 0x29, 0xB0, 
-0x54, 0x43, 0x37, 0x40, 0x54, 0xE0, 0x0B, 0xB0, 0x56, 0x23, 0x19, 0x40, 0x56, 
0xC9, 0x28, 0x30, 
+0x54, 0x43, 0x37, 0x40, 0x54, 0xE9, 0x46, 0x30, 0x56, 0x23, 0x19, 0x40, 0x56, 
0xC9, 0x28, 0x30, 
 0x58, 0x02, 0xFB, 0x40, 0x58, 0xA9, 0x0A, 0x30, 0x59, 0xE2, 0xDD, 0x40, 0x5A, 
0x88, 0xEC, 0x30, 
 0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 0x68, 0xCE, 0x30, 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 
0x48, 0xB0, 0x30, 
 0x5F, 0x8B, 0xBD, 0xC0, 0x60, 0x31, 0xCC, 0xB0, 0x61, 0x6B, 0x9F, 0xC0, 0x62, 
0x11, 0xAE, 0xB0, 
-0x63, 0x4B, 0x81, 0xC0, 0x63, 0xF1, 0x90, 0xB0, 0x65, 0x2B, 0x63, 0xC0, 0x65, 
0xD1, 0x72, 0xB0, 
-0x67, 0x14, 0x80, 0x40, 0x67, 0xB1, 0x54, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 
0x91, 0x36, 0xB0, 
+0x63, 0x4B, 0x81, 0xC0, 0x63, 0xFA, 0xCB, 0x30, 0x65, 0x2B, 0x63, 0xC0, 0x65, 
0xD1, 0x72, 0xB0, 
+0x67, 0x14, 0x80, 0x40, 0x67, 0xB1, 0x54, 0xB0, 0x68, 0xF4, 0x62, 0x40, 0x69, 
0x9A, 0x71, 0x30, 
 0x6A, 0xD4, 0x44, 0x40, 0x6B, 0x7A, 0x53, 0x30, 0x6C, 0xB4, 0x26, 0x40, 0x6D, 
0x5A, 0x35, 0x30, 
 0x6E, 0x94, 0x08, 0x40, 0x6F, 0x3A, 0x17, 0x30, 0x70, 0x7D, 0x24, 0xC0, 0x71, 
0x19, 0xF9, 0x30, 
 0x72, 0x5D, 0x06, 0xC0, 0x72, 0xF9, 0xDB, 0x30, 0x74, 0x3C, 0xE8, 0xC0, 0x74, 
0xD9, 0xBD, 0x30, 
-0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xC2, 0xD9, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 
0xA2, 0xBB, 0xB0, 
+0x76, 0x1C, 0xCA, 0xC0, 0x76, 0xC2, 0xD9, 0xB0, 0x77, 0xFC, 0xAC, 0xC0, 0x78, 
0xAB, 0xF6, 0x30, 
 0x79, 0xDC, 0x8E, 0xC0, 0x7A, 0x82, 0x9D, 0xB0, 0x7B, 0xC5, 0xAB, 0x40, 0x7C, 
0x62, 0x7F, 0xB0, 
-0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x42, 0x61, 0xB0, 0x7F, 0x85, 0x6F, 0x40, 0x02, 
0x01, 0x02, 0x01, 
+0x7D, 0xA5, 0x8D, 0x40, 0x7E, 0x4B, 0x9C, 0x30, 0x7F, 0x85, 0x6F, 0x40, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 
0x01, 0x02, 0x01, 
@@ -2734,19 +2734,19 @@
 0x43, 0x51, 0xD0, 0x40, 0x43, 0xF7, 0xDF, 0x30, 0x45, 0x4D, 0x61, 0xC0, 0x45, 
0xE0, 0xFB, 0xB0, 
 0x47, 0x11, 0x94, 0x40, 0x47, 0xB7, 0xA3, 0x30, 0x48, 0xFA, 0xB0, 0xC0, 0x49, 
0x97, 0x85, 0x30, 
 0x4A, 0xDA, 0x92, 0xC0, 0x4B, 0x80, 0xA1, 0xB0, 0x4C, 0xBA, 0x74, 0xC0, 0x4D, 
0x60, 0x83, 0xB0, 
-0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x40, 0x65, 0xB0, 0x50, 0x83, 0x73, 0x40, 0x51, 
0x20, 0x47, 0xB0, 
-0x52, 0x63, 0x55, 0x40, 0x53, 0x00, 0x29, 0xB0, 0x54, 0x43, 0x37, 0x40, 0x54, 
0xE0, 0x0B, 0xB0, 
+0x4E, 0x9A, 0x56, 0xC0, 0x4F, 0x49, 0xA0, 0x30, 0x50, 0x83, 0x73, 0x40, 0x51, 
0x20, 0x47, 0xB0, 
+0x52, 0x63, 0x55, 0x40, 0x53, 0x00, 0x29, 0xB0, 0x54, 0x43, 0x37, 0x40, 0x54, 
0xE9, 0x46, 0x30, 
 0x56, 0x23, 0x19, 0x40, 0x56, 0xC9, 0x28, 0x30, 0x58, 0x02, 0xFB, 0x40, 0x58, 
0xA9, 0x0A, 0x30, 
 0x59, 0xE2, 0xDD, 0x40, 0x5A, 0x88, 0xEC, 0x30, 0x5B, 0xCB, 0xF9, 0xC0, 0x5C, 
0x68, 0xCE, 0x30, 
 0x5D, 0xAB, 0xDB, 0xC0, 0x5E, 0x48, 0xB0, 0x30, 0x5F, 0x8B, 0xBD, 0xC0, 0x60, 
0x31, 0xCC, 0xB0, 
-0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x11, 0xAE, 0xB0, 0x63, 0x4B, 0x81, 0xC0, 0x63, 
0xF1, 0x90, 0xB0, 
+0x61, 0x6B, 0x9F, 0xC0, 0x62, 0x11, 0xAE, 0xB0, 0x63, 0x4B, 0x81, 0xC0, 0x63, 
0xFA, 0xCB, 0x30, 
 0x65, 0x2B, 0x63, 0xC0, 0x65, 0xD1, 0x72, 0xB0, 0x67, 0x14, 0x80, 0x40, 0x67, 
0xB1, 0x54, 0xB0, 
-0x68, 0xF4, 0x62, 0x40, 0x69, 0x91, 0x36, 0xB0, 0x6A, 0xD4, 0x44, 0x40, 0x6B, 
0x7A, 0x53, 0x30, 
+0x68, 0xF4, 0x62, 0x40, 0x69, 0x9A, 0x71, 0x30, 0x6A, 0xD4, 0x44, 0x40, 0x6B, 
0x7A, 0x53, 0x30, 
 0x6C, 0xB4, 0x26, 0x40, 0x6D, 0x5A, 0x35, 0x30, 0x6E, 0x94, 0x08, 0x40, 0x6F, 
0x3A, 0x17, 0x30, 
 0x70, 0x7D, 0x24, 0xC0, 0x71, 0x19, 0xF9, 0x30, 0x72, 0x5D, 0x06, 0xC0, 0x72, 
0xF9, 0xDB, 0x30, 
 0x74, 0x3C, 0xE8, 0xC0, 0x74, 0xD9, 0xBD, 0x30, 0x76, 0x1C, 0xCA, 0xC0, 0x76, 
0xC2, 0xD9, 0xB0, 
-0x77,

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/interbase ibase_query.c /ext/interbase/tests bug45373.phpt

2008-10-06 Thread Felipe Pena

felipe  Mon Oct  6 14:33:35 2008 UTC

  Added files: (Branch: PHP_5_3)
/php-src/ext/interbase/testsbug45373.phpt 

  Modified files:  
/php-src/ext/interbase  ibase_query.c 
  Log:
  - MFH: Fixed bug #45373 (php crash on query with errors in params)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_query.c?r1=1.23.2.1.2.10.2.5r2=1.23.2.1.2.10.2.6diff_format=u
Index: php-src/ext/interbase/ibase_query.c
diff -u php-src/ext/interbase/ibase_query.c:1.23.2.1.2.10.2.5 
php-src/ext/interbase/ibase_query.c:1.23.2.1.2.10.2.6
--- php-src/ext/interbase/ibase_query.c:1.23.2.1.2.10.2.5   Mon Dec 31 
07:17:09 2007
+++ php-src/ext/interbase/ibase_query.c Mon Oct  6 14:33:34 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_query.c,v 1.23.2.1.2.10.2.5 2007/12/31 07:17:09 sebastian Exp $ 
*/
+/* $Id: ibase_query.c,v 1.23.2.1.2.10.2.6 2008/10/06 14:33:34 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1862,16 +1862,17 @@
if (bind_n != expected_n) {
php_error_docref(NULL TSRMLS_CC, (bind_n  expected_n) 
? E_WARNING : E_NOTICE,
Statement expects %d arguments, %d given, 
expected_n, bind_n);
+
if (bind_n  expected_n) {
break;
}
+   }
 
-   } else if (bind_n  0) { /* have variables to bind */
-   args = (zval ***) do_alloca(ZEND_NUM_ARGS() * 
sizeof(zval **), use_heap);
+   /* have variables to bind */
+   args = (zval ***) do_alloca((expected_n + 1) * sizeof(zval **), 
use_heap);

-   if (FAILURE == 
zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args)) {
-   break;
-   }
+   if (FAILURE == zend_get_parameters_array_ex((expected_n + 1), 
args)) {
+   break;
}
 
/* Have we used this cursor before and it's still open (exec 
proc has no cursor) ? */

http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/bug45373.phpt?view=markuprev=1.1
Index: php-src/ext/interbase/tests/bug45373.phpt
+++ php-src/ext/interbase/tests/bug45373.phpt
--TEST--
Bug #45373 (php crash on query with errors in params)
--SKIPIF--
?php include(skipif.inc); ?
--FILE--
?php

require(interbase.inc);

$db = ibase_connect($test_base);


$sql = select * from test1 where i = ? and c = ?;

$q = ibase_prepare($db, $sql);
$r = ibase_execute($q, 1, 'test table not created with isql');
var_dump(ibase_fetch_assoc($r));
ibase_free_result($r);

$r = ibase_execute($q, 1, 'test table not created with isql', 1);
var_dump(ibase_fetch_assoc($r));
ibase_free_result($r);

$r = ibase_execute($q, 1);
var_dump(ibase_fetch_assoc($r));

?
--EXPECTF--
array(2) {
  [I]=
  int(1)
  [C]=
  string(32) test table not created with isql
}

Notice: ibase_execute(): Statement expects 2 arguments, 3 given in 
%sbug45373.php on line %d
array(2) {
  [I]=
  int(1)
  [C]=
  string(32) test table not created with isql
}

Warning: ibase_execute(): Statement expects 2 arguments, 1 given in 
%sbug45373.php on line %d

Warning: ibase_fetch_assoc(): supplied argument is not a valid 
Firebird/InterBase result resource in %sbug45373.php on line %d
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/interbase ibase_query.c /ext/interbase/tests bug45373.phpt

2008-10-06 Thread Felipe Pena

felipe  Mon Oct  6 14:37:13 2008 UTC

  Added files: (Branch: PHP_5_2)
/php-src/ext/interbase/testsbug45373.phpt 

  Modified files:  
/php-src/ext/interbase  ibase_query.c 
  Log:
  - MFH: Fixed bug #45373 (php crash on query with errors in params)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_query.c?r1=1.23.2.1.2.11r2=1.23.2.1.2.12diff_format=u
Index: php-src/ext/interbase/ibase_query.c
diff -u php-src/ext/interbase/ibase_query.c:1.23.2.1.2.11 
php-src/ext/interbase/ibase_query.c:1.23.2.1.2.12
--- php-src/ext/interbase/ibase_query.c:1.23.2.1.2.11   Mon Dec 31 07:20:07 2007
+++ php-src/ext/interbase/ibase_query.c Mon Oct  6 14:37:13 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_query.c,v 1.23.2.1.2.11 2007/12/31 07:20:07 sebastian Exp $ */
+/* $Id: ibase_query.c,v 1.23.2.1.2.12 2008/10/06 14:37:13 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -1819,16 +1819,17 @@
if (bind_n != expected_n) {
php_error_docref(NULL TSRMLS_CC, (bind_n  expected_n) 
? E_WARNING : E_NOTICE,
Statement expects %d arguments, %d given, 
expected_n, bind_n);
+
if (bind_n  expected_n) {
break;
}
-
-   } else if (bind_n  0) { /* have variables to bind */
-   args = (zval ***) do_alloca(ZEND_NUM_ARGS() * 
sizeof(zval **));
+   }
+   
+   /* have variables to bind */
+   args = (zval ***) do_alloca((expected_n + 1) * sizeof(zval **));

-   if (FAILURE == 
zend_get_parameters_array_ex(ZEND_NUM_ARGS(), args)) {
-   break;
-   }
+   if (FAILURE == zend_get_parameters_array_ex((expected_n + 1), 
args)) {
+   break;
}
 
/* Have we used this cursor before and it's still open (exec 
proc has no cursor) ? */

http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/tests/bug45373.phpt?view=markuprev=1.1
Index: php-src/ext/interbase/tests/bug45373.phpt
+++ php-src/ext/interbase/tests/bug45373.phpt
--TEST--
Bug #45373 (php crash on query with errors in params)
--SKIPIF--
?php include(skipif.inc); ?
--FILE--
?php

require(interbase.inc);

$db = ibase_connect($test_base);


$sql = select * from test1 where i = ? and c = ?;

$q = ibase_prepare($db, $sql);
$r = ibase_execute($q, 1, 'test table not created with isql');
var_dump(ibase_fetch_assoc($r));
ibase_free_result($r);

$r = ibase_execute($q, 1, 'test table not created with isql', 1);
var_dump(ibase_fetch_assoc($r));
ibase_free_result($r);

$r = ibase_execute($q, 1);
var_dump(ibase_fetch_assoc($r));

?
--EXPECTF--
array(2) {
  [I]=
  int(1)
  [C]=
  string(32) test table not created with isql
}

Notice: ibase_execute(): Statement expects 2 arguments, 3 given in 
%sbug45373.php on line %d
array(2) {
  [I]=
  int(1)
  [C]=
  string(32) test table not created with isql
}

Warning: ibase_execute(): Statement expects 2 arguments, 1 given in 
%sbug45373.php on line %d

Warning: ibase_fetch_assoc(): supplied argument is not a valid 
Firebird/InterBase result resource in %sbug45373.php on line %d
bool(false)



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

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

2008-10-06 Thread Felipe Pena

felipe  Mon Oct  6 15:13:27 2008 UTC

  Modified files:  
/php-src/ext/interbase  ibase_service.c 
  Log:
  - Fixed compiler warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_service.c?r1=1.17r2=1.18diff_format=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.17 
php-src/ext/interbase/ibase_service.c:1.18
--- php-src/ext/interbase/ibase_service.c:1.17  Mon Dec 31 07:12:10 2007
+++ php-src/ext/interbase/ibase_service.c   Mon Oct  6 15:13:27 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_service.c,v 1.17 2007/12/31 07:12:10 sebastian Exp $ */
+/* $Id: ibase_service.c,v 1.18 2008/10/06 15:13:27 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -229,8 +229,7 @@
user, isc_spb_password, (char)plen, pass, host);
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -451,8 +450,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len = 0) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -560,8 +558,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_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/interbase ibase_service.c

2008-10-06 Thread Felipe Pena

felipe  Mon Oct  6 15:13:53 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/interbase  ibase_service.c 
  Log:
  - MFH: Fixed compiler warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_service.c?r1=1.11.2.2.2.5.2.1r2=1.11.2.2.2.5.2.2diff_format=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11.2.2.2.5.2.1 
php-src/ext/interbase/ibase_service.c:1.11.2.2.2.5.2.2
--- php-src/ext/interbase/ibase_service.c:1.11.2.2.2.5.2.1  Mon Dec 31 
07:17:09 2007
+++ php-src/ext/interbase/ibase_service.c   Mon Oct  6 15:13:53 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_service.c,v 1.11.2.2.2.5.2.1 2007/12/31 07:17:09 sebastian Exp $ 
*/
+/* $Id: ibase_service.c,v 1.11.2.2.2.5.2.2 2008/10/06 15:13:53 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -229,8 +229,7 @@
user, isc_spb_password, (char)plen, pass, host);
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -451,8 +450,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len = 0) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -560,8 +558,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_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/interbase ibase_service.c

2008-10-06 Thread Felipe Pena

felipe  Mon Oct  6 15:14:18 2008 UTC

  Modified files:  (Branch: PHP_5_2)
/php-src/ext/interbase  ibase_service.c 
  Log:
  - MFH: Fixed compiler warning
  
http://cvs.php.net/viewvc.cgi/php-src/ext/interbase/ibase_service.c?r1=1.11.2.2.2.6r2=1.11.2.2.2.7diff_format=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.11.2.2.2.6 
php-src/ext/interbase/ibase_service.c:1.11.2.2.2.7
--- php-src/ext/interbase/ibase_service.c:1.11.2.2.2.6  Mon Dec 31 07:20:07 2007
+++ php-src/ext/interbase/ibase_service.c   Mon Oct  6 15:14:17 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: ibase_service.c,v 1.11.2.2.2.6 2007/12/31 07:20:07 sebastian Exp $ */
+/* $Id: ibase_service.c,v 1.11.2.2.2.7 2008/10/06 15:14:17 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include config.h
@@ -229,8 +229,7 @@
user, isc_spb_password, (char)plen, pass, host);
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -451,8 +450,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len = 0) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_FALSE;
}
 
@@ -560,8 +558,7 @@
}
 
if (spb_len  sizeof(buf) || spb_len == -1) {
-   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%ld)
-   TSRMLS_CC, spb_len);
+   _php_ibase_module_error(Internal error: insufficient buffer 
space for SPB (%d) TSRMLS_CC, spb_len);
RETURN_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/mssql php_mssql.c

2008-10-06 Thread Kalle Sommer Nielsen

kalle   Mon Oct  6 21:50:48 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/mssql  php_mssql.c 
  Log:
  MFH:
  * is_output and is_null parameters are now booleans instead of int in 
mssql_bind
  * Added missing conditional from old parameter parsing
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.9r2=1.152.2.13.2.4.2.10diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.9 
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.10
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.9Sun Oct  5 04:55:49 2008
+++ php-src/ext/mssql/php_mssql.c   Mon Oct  6 21:50:48 2008
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.9 2008/10/05 04:55:49 kalle Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.10 2008/10/06 21:50:48 kalle Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -2009,23 +2009,28 @@
 }
 /* }}} */
 
-/* {{{ proto bool mssql_bind(resource stmt, string param_name, mixed var, int 
type [, int is_output [, int is_null [, int maxlen]]])
+/* {{{ proto bool mssql_bind(resource stmt, string param_name, mixed var, int 
type [, bool is_output [, bool is_null [, int maxlen]]])
Adds a parameter to a stored procedure or a remote stored procedure  */
 PHP_FUNCTION(mssql_bind)
 {
char *param_name;
int param_name_len, datalen;
int status = 0;
-   long type = 0, is_output = 0, is_null = 0, maxlen = -1;
+   long type = 0, maxlen = -1;
zval *stmt, **var;
+   zend_bool is_output = 0, is_null = 0;
mssql_link *mssql_ptr;
mssql_statement *statement;
mssql_bind bind,*bindp;
LPBYTE value = NULL;
 
-   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsZl|lll, stmt, 
param_name, param_name_len, var, type, is_output, is_null, maxlen) == 
FAILURE) {
+   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, rsZl|bbl, stmt, 
param_name, param_name_len, var, type, is_output, is_null, maxlen) == 
FAILURE) {
return;
}
+
+   if (ZEND_NUM_ARGS() == 7  !is_output) {
+   maxlen = -1;
+   }

ZEND_FETCH_RESOURCE(statement, mssql_statement *, stmt, -1, MS 
SQL-Statement, le_statement);
 
@@ -2039,24 +2044,21 @@
if (is_null) {
maxlen=0;
datalen=0;
-   }
-   else {
+   } else {
convert_to_string_ex(var);
datalen=Z_STRLEN_PP(var);
value=(LPBYTE)Z_STRVAL_PP(var);
}
-   }
-   else{   /* fixed-length type */
+   } else {
+   /* fixed-length type */
if (is_null){
datalen=0;
-   }
-   else {
+   } else {
datalen=-1;
}
maxlen=-1;
 
-   switch (type)   {
-
+   switch (type) {
case SQLFLT4:
case SQLFLT8:
case SQLFLTN:



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

[PHP-CVS-DAILY] cvs: php-src / ChangeLog

[PHP-CVS-DAILY] cvs: ZendEngine2 / ChangeLog

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

Re: [PHP-CVS] cvs: php-src /ext/msql php_msql.c

[PHP-CVS] cvs: php-src /ext/date/lib timezonedb.h

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/date/lib timezonedb.h

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/date/lib timezonedb.h

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/interbase ibase_query.c /ext/interbase/tests bug45373.phpt

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/interbase ibase_query.c /ext/interbase/tests bug45373.phpt

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

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

[PHP-CVS] cvs: php-src(PHP_5_2) /ext/interbase ibase_service.c

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

13 matches

Site Navigation

Mail list logo

Footer information