lbarnaud Tue Oct 21 23:39:16 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/bcmath bcmath.c
/php-src/ext/bz2 bz2.c
/php-src/ext/curl interface.c
/php-src/ext/date php_date.c
/php-src/ext/dom domimplementation.c
/php-src/ext/exif exif.c
/php-src/ext/gd gd.c
/php-src/ext/openssl openssl.c
/php-src/ext/simplexml simplexml.c
/php-src/ext/soap soap.c
/php-src/ext/sockets sockets.c
/php-src/ext/sysvshm sysvshm.c
/php-src/ext/zip php_zip.c
Log:
MFH: initialize optional vars
http://cvs.php.net/viewvc.cgi/php-src/ext/bcmath/bcmath.c?r1=1.62.2.2.2.8.2.3&r2=1.62.2.2.2.8.2.4&diff_format=u
Index: php-src/ext/bcmath/bcmath.c
diff -u php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.3
php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.4
--- php-src/ext/bcmath/bcmath.c:1.62.2.2.2.8.2.3 Tue Jun 24 16:01:32 2008
+++ php-src/ext/bcmath/bcmath.c Tue Oct 21 23:39:14 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bcmath.c,v 1.62.2.2.2.8.2.3 2008/06/24 16:01:32 felipe Exp $ */
+/* $Id: bcmath.c,v 1.62.2.2.2.8.2.4 2008/10/21 23:39:14 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -215,7 +215,7 @@
PHP_FUNCTION(bcadd)
{
char *left, *right;
- long scale_param;
+ long scale_param = 0;
bc_num first, second, result;
int left_len, right_len;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@@ -255,7 +255,7 @@
{
char *left, *right;
int left_len, right_len;
- long scale_param;
+ long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@@ -294,7 +294,7 @@
{
char *left, *right;
int left_len, right_len;
- long scale_param;
+ long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@@ -333,7 +333,7 @@
{
char *left, *right;
int left_len, right_len;
- long scale_param;
+ long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@@ -457,7 +457,7 @@
{
char *left, *right;
int left_len, right_len;
- long scale_param;
+ long scale_param = 0;
bc_num first, second, result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@@ -496,7 +496,7 @@
{
char *left;
int left_len;
- long scale_param;
+ long scale_param = 0;
bc_num result;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
@@ -533,7 +533,7 @@
{
char *left, *right;
int left_len, right_len;
- long scale_param;
+ long scale_param = 0;
bc_num first, second;
int scale = BCG(bc_precision), argc = ZEND_NUM_ARGS();
http://cvs.php.net/viewvc.cgi/php-src/ext/bz2/bz2.c?r1=1.14.2.3.2.12.2.6&r2=1.14.2.3.2.12.2.7&diff_format=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.6
php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.7
--- php-src/ext/bz2/bz2.c:1.14.2.3.2.12.2.6 Wed Jul 23 11:25:14 2008
+++ php-src/ext/bz2/bz2.c Tue Oct 21 23:39:14 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.14.2.3.2.12.2.6 2008/07/23 11:25:14 tony2001 Exp $ */
+/* $Id: bz2.c,v 1.14.2.3.2.12.2.7 2008/10/21 23:39:14 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -482,8 +482,8 @@
static PHP_FUNCTION(bzcompress)
{
char *source; /* Source data to compress */
- long zblock_size; /* Optional block size to use */
- long zwork_factor; /* Optional work factor to use */
+ long zblock_size = 0; /* Optional block size to use */
+ long zwork_factor = 0;/* Optional work factor to use */
char *dest = NULL; /* Destination to place the
compressed data into */
int error, /* Error Container */
block_size = 4, /* Block size for
compression algorithm */
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.27.2.12&r2=1.62.2.14.2.27.2.13&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.27.2.12
php-src/ext/curl/interface.c:1.62.2.14.2.27.2.13
--- php-src/ext/curl/interface.c:1.62.2.14.2.27.2.12 Tue Jul 29 10:42:44 2008
+++ php-src/ext/curl/interface.c Tue Oct 21 23:39:14 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.27.2.12 2008/07/29 10:42:44 tony2001 Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.27.2.13 2008/10/21 23:39:14 lbarnaud Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -1090,7 +1090,7 @@
php_curl *ch;
CURL *cp;
char *url = NULL;
- int url_len;
+ int url_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &url,
&url_len) == FAILURE) {
return;
@@ -1727,7 +1727,7 @@
zval *zid;
php_curl *ch;
int argc = ZEND_NUM_ARGS();
- long option;
+ long option = 0;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &zid, &option) ==
FAILURE) {
return;
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.43.2.45.2.51.2.54&r2=1.43.2.45.2.51.2.55&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.43.2.45.2.51.2.54
php-src/ext/date/php_date.c:1.43.2.45.2.51.2.55
--- php-src/ext/date/php_date.c:1.43.2.45.2.51.2.54 Fri Aug 8 22:07:07 2008
+++ php-src/ext/date/php_date.c Tue Oct 21 23:39:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.43.2.45.2.51.2.54 2008/08/08 22:07:07 colder Exp $ */
+/* $Id: php_date.c,v 1.43.2.45.2.51.2.55 2008/10/21 23:39:15 lbarnaud Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1385,7 +1385,7 @@
{
char *format;
int format_len;
- long ts;
+ long ts = 0;
int ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format,
&format_len, &ts) == FAILURE) {
@@ -1448,7 +1448,7 @@
char *times, *initial_ts;
int time_len, error1, error2;
struct timelib_error_container *error;
- long preset_ts, ts;
+ long preset_ts = 0, ts;
timelib_time *t, *now;
timelib_tzinfo *tzi;
@@ -1505,7 +1505,7 @@
/* {{{ php_mktime - (gm)mktime helper */
PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
{
- long hou, min, sec, mon, day, yea, dst = -1;
+ long hou = 0, min = 0, sec = 0, mon = 0, day = 0, yea = 0, dst = -1;
timelib_time *now;
timelib_tzinfo *tzi = NULL;
long ts, adjust_seconds = 0;
@@ -1634,7 +1634,7 @@
{
char *format, *buf;
int format_len;
- long timestamp;
+ long timestamp = 0;
struct tm ta;
int max_reallocs = 5;
size_t buf_len = 64, real_len;
@@ -3788,7 +3788,7 @@
const timelib_tzdb_index_entry *table;
int i, item_count;
long what = PHP_DATE_TIMEZONE_GROUP_ALL;
- char *option;
+ char *option = NULL;
int option_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ls", &what,
&option, &option_len) == FAILURE) {
@@ -3894,10 +3894,10 @@
*/
static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int
calc_sunset)
{
- double latitude, longitude, zenith, gmt_offset = 0, altitude;
+ double latitude = 0.0, longitude = 0.0, zenith = 0.0, gmt_offset = 0,
altitude;
double h_rise, h_set, N;
timelib_sll rise, set, transit;
- long time, retformat;
+ long time, retformat = 0;
int rs;
timelib_time *t;
timelib_tzinfo *tzi;
http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementation.c?r1=1.15.2.2.2.2.2.4&r2=1.15.2.2.2.2.2.5&diff_format=u
Index: php-src/ext/dom/domimplementation.c
diff -u php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.4
php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.5
--- php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.4 Thu Aug 14
08:39:04 2008
+++ php-src/ext/dom/domimplementation.c Tue Oct 21 23:39:15 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.4 2008/08/14 08:39:04 tony2001
Exp $ */
+/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.5 2008/10/21 23:39:15 lbarnaud
Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -98,7 +98,7 @@
zval *rv = NULL;
xmlDtd *doctype;
int ret, name_len = 0, publicid_len = 0, systemid_len = 0;
- char *name, *publicid, *systemid;
+ char *name = NULL, *publicid = NULL, *systemid = NULL;
xmlChar *pch1 = NULL, *pch2 = NULL, *localname = NULL;
xmlURIPtr uri;
@@ -161,7 +161,7 @@
xmlDtdPtr doctype = NULL;
xmlNsPtr nsptr = NULL;
int ret, uri_len = 0, name_len = 0, errorcode = 0;
- char *uri, *name;
+ char *uri = NULL, *name = NULL;
char *prefix = NULL, *localname = NULL;
dom_object *doctobj;
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.8&r2=1.173.2.5.2.20.2.9&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.8
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.9
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.8 Sun Aug 3 12:11:07 2008
+++ php-src/ext/exif/exif.c Tue Oct 21 23:39:15 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: exif.c,v 1.173.2.5.2.20.2.8 2008/08/03 12:11:07 jani Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.9 2008/10/21 23:39:15 lbarnaud Exp $ */
/* ToDos
*
@@ -142,7 +142,7 @@
};
/* }}} */
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.8 2008/08/03 12:11:07
jani Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.9 2008/10/21 23:39:15
lbarnaud Exp $"
/* {{{ PHP_MINFO_FUNCTION
*/
@@ -3908,8 +3908,8 @@
Reads header data from the JPEG/TIFF image filename and optionally reads
the internal thumbnails */
PHP_FUNCTION(exif_read_data)
{
- char *p_name, *p_sections_needed;
- int p_name_len, p_sections_needed_len;
+ char *p_name, *p_sections_needed = NULL;
+ int p_name_len, p_sections_needed_len = 0;
zend_bool sub_arrays=0, read_thumbnail=0, read_all=0;
int i, ac = ZEND_NUM_ARGS(), ret, sections_needed=0;
http://cvs.php.net/viewvc.cgi/php-src/ext/gd/gd.c?r1=1.312.2.20.2.32.2.18&r2=1.312.2.20.2.32.2.19&diff_format=u
Index: php-src/ext/gd/gd.c
diff -u php-src/ext/gd/gd.c:1.312.2.20.2.32.2.18
php-src/ext/gd/gd.c:1.312.2.20.2.32.2.19
--- php-src/ext/gd/gd.c:1.312.2.20.2.32.2.18 Mon Oct 6 17:57:32 2008
+++ php-src/ext/gd/gd.c Tue Oct 21 23:39:15 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: gd.c,v 1.312.2.20.2.32.2.18 2008/10/06 17:57:32 iliaa Exp $ */
+/* $Id: gd.c,v 1.312.2.20.2.32.2.19 2008/10/21 23:39:15 lbarnaud Exp $ */
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
Cold Spring Harbor Labs. */
@@ -2715,11 +2715,11 @@
{
zval *imgind;
char *file = NULL;
- long quality, type;
+ long quality = 0, type = 0;
gdImagePtr im;
char *fn = NULL;
FILE *fp;
- int file_len, argc = ZEND_NUM_ARGS();
+ int file_len = 0, argc = ZEND_NUM_ARGS();
int q = -1, i, t = 1;
/* The quality parameter for Wbmp stands for the threshold when called
from image2wbmp() */
@@ -3472,7 +3472,7 @@
PHP_FUNCTION(imagecolortransparent)
{
zval *IM;
- long COL;
+ long COL = 0;
gdImagePtr im;
int argc = ZEND_NUM_ARGS();
@@ -3496,7 +3496,7 @@
{
zval *IM;
int argc = ZEND_NUM_ARGS();
- long INT;
+ long INT = 0;
gdImagePtr im;
if (zend_parse_parameters(argc TSRMLS_CC, "r|l", &IM, &INT) == FAILURE)
{
@@ -4453,7 +4453,7 @@
PHP_FUNCTION(imagepsbbox)
{
zval *fnt;
- long sz = 0, sp, wd;
+ long sz = 0, sp = 0, wd = 0;
char *str;
int i, space = 0, add_width = 0, char_width, amount_kern;
int cur_x, cur_y, dx, dy;
@@ -4461,7 +4461,7 @@
int *f_ind;
int str_len, per_char = 0;
int argc = ZEND_NUM_ARGS();
- double angle, sin_a = 0, cos_a = 0;
+ double angle = 0, sin_a = 0, cos_a = 0;
BBox char_bbox, str_bbox = {0, 0, 0, 0};
if (argc != 3 && argc != 6) {
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.19&r2=1.98.2.5.2.41.2.20&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.19
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.20
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.19 Tue Oct 14 23:38:41 2008
+++ php-src/ext/openssl/openssl.c Tue Oct 21 23:39:15 2008
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.19 2008/10/14 23:38:41 iliaa Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.20 2008/10/21 23:39:15 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1527,7 +1527,7 @@
STACK_OF(X509) * untrustedchain = NULL;
long purpose;
char * untrusted = NULL;
- int untrusted_len, ret;
+ int untrusted_len = 0, ret;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Zl|a!s", &zcert,
&purpose, &zcainfo, &untrusted, &untrusted_len) == FAILURE) {
return;
@@ -3133,7 +3133,7 @@
zval **cert;
EVP_PKEY *pkey;
char * passphrase = "";
- int passphrase_len;
+ int passphrase_len = sizeof("")-1;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "Z|s", &cert,
&passphrase, &passphrase_len) == FAILURE) {
return;
@@ -3265,9 +3265,9 @@
BIO * in = NULL, * datain = NULL, * dataout = NULL;
long flags = 0;
char * filename; int filename_len;
- char * extracerts = NULL; int extracerts_len;
- char * signersfilename = NULL; int signersfilename_len;
- char * datafilename = NULL; int datafilename_len;
+ char * extracerts = NULL; int extracerts_len = 0;
+ char * signersfilename = NULL; int signersfilename_len = 0;
+ char * datafilename = NULL; int datafilename_len = 0;
RETVAL_LONG(-1);
@@ -4078,7 +4078,7 @@
unsigned char *buf = NULL, **eks;
char * data; int data_len;
char *method =NULL;
- int method_len;
+ int method_len = 0;
const EVP_CIPHER *cipher;
EVP_CIPHER_CTX ctx;
@@ -4204,7 +4204,7 @@
char * data; int data_len;
char * ekey; int ekey_len;
char *method =NULL;
- int method_len;
+ int method_len = 0;
const EVP_CIPHER *cipher;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "szsZ|s", &data,
&data_len, &opendata, &ekey, &ekey_len, &privkey, &method, &method_len) ==
FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/simplexml/simplexml.c?r1=1.151.2.22.2.35.2.22&r2=1.151.2.22.2.35.2.23&diff_format=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.22
php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.23
--- php-src/ext/simplexml/simplexml.c:1.151.2.22.2.35.2.22 Mon Oct 20
19:29:04 2008
+++ php-src/ext/simplexml/simplexml.c Tue Oct 21 23:39:15 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: simplexml.c,v 1.151.2.22.2.35.2.22 2008/10/20 19:29:04 rrichards Exp $
*/
+/* $Id: simplexml.c,v 1.151.2.22.2.35.2.23 2008/10/21 23:39:15 lbarnaud Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1502,7 +1502,7 @@
{
php_sxe_object *sxe;
char *nsprefix = NULL;
- int nsprefix_len;
+ int nsprefix_len = 0;
xmlNodePtr node;
zend_bool isprefix = 0;
@@ -1551,7 +1551,7 @@
{
php_sxe_object *sxe;
char *nsprefix = NULL;
- int nsprefix_len;
+ int nsprefix_len = 0;
xmlNodePtr node;
zend_bool isprefix = 0;
@@ -2562,7 +2562,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "Simplexml support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.22 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.151.2.22.2.35.2.23 $");
php_info_print_table_row(2, "Schema support",
#ifdef LIBXML_SCHEMAS_ENABLED
"enabled");
http://cvs.php.net/viewvc.cgi/php-src/ext/soap/soap.c?r1=1.156.2.28.2.30.2.23&r2=1.156.2.28.2.30.2.24&diff_format=u
Index: php-src/ext/soap/soap.c
diff -u php-src/ext/soap/soap.c:1.156.2.28.2.30.2.23
php-src/ext/soap/soap.c:1.156.2.28.2.30.2.24
--- php-src/ext/soap/soap.c:1.156.2.28.2.30.2.23 Mon Sep 15 18:07:16 2008
+++ php-src/ext/soap/soap.c Tue Oct 21 23:39:15 2008
@@ -17,7 +17,7 @@
| Dmitry Stogov <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: soap.c,v 1.156.2.28.2.30.2.23 2008/09/15 18:07:16 felipe Exp $ */
+/* $Id: soap.c,v 1.156.2.28.2.30.2.24 2008/10/21 23:39:15 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -951,7 +951,7 @@
PHP_METHOD(SoapFault, SoapFault)
{
char *fault_string = NULL, *fault_code = NULL, *fault_actor = NULL,
*name = NULL, *fault_code_ns = NULL;
- int fault_string_len, fault_actor_len, name_len, fault_code_len = 0;
+ int fault_string_len, fault_actor_len = 0, name_len = 0, fault_code_len
= 0;
zval *code = NULL, *details = NULL, *headerfault = NULL;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zs|s!z!s!z",
@@ -1052,7 +1052,7 @@
{
zval *data, *type;
char *stype = NULL, *ns = NULL, *name = NULL, *namens = NULL;
- int stype_len, ns_len, name_len, namens_len;
+ int stype_len = 0, ns_len = 0, name_len = 0, namens_len = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!z|ssss", &data,
&type, &stype, &stype_len, &ns, &ns_len, &name, &name_len, &namens,
&namens_len) == FAILURE) {
return;
@@ -1616,7 +1616,7 @@
soapHeader *soap_headers = NULL;
sdlFunctionPtr function;
char *arg = NULL;
- int arg_len;
+ int arg_len = 0;
xmlCharEncodingHandlerPtr old_encoding;
HashTable *old_class_map, *old_typemap;
int old_features;
@@ -2154,7 +2154,7 @@
PHP_METHOD(SoapServer, fault)
{
char *code, *string, *actor=NULL, *name=NULL;
- int code_len, string_len, actor_len, name_len;
+ int code_len, string_len, actor_len = 0, name_len = 0;
zval* details = NULL;
SOAP_SERVER_BEGIN_CODE();
@@ -3290,7 +3290,7 @@
{
char *name;
char *val = NULL;
- int name_len, val_len;
+ int name_len, val_len = 0;
zval **cookies;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|s", &name,
&name_len, &val, &val_len) == FAILURE) {
@@ -3368,7 +3368,7 @@
PHP_METHOD(SoapClient, __setLocation)
{
char *location = NULL;
- int location_len;
+ int location_len = 0;
zval **tmp;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &location,
&location_len) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.6&r2=1.171.2.9.2.14.2.7&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.6
php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.7
--- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.6 Sat Aug 23 19:22:07 2008
+++ php-src/ext/sockets/sockets.c Tue Oct 21 23:39:15 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.171.2.9.2.14.2.6 2008/08/23 19:22:07 pajoye Exp $ */
+/* $Id: sockets.c,v 1.171.2.9.2.14.2.7 2008/10/21 23:39:15 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -986,7 +986,7 @@
zval *arg1;
php_socket *php_sock;
int retval, str_len;
- long length;
+ long length = 0;
char *str;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1,
&str, &str_len, &length) == FAILURE) {
@@ -1280,7 +1280,7 @@
struct sockaddr_un s_un;
char *addr;
int retval, addr_len;
- long port;
+ long port = 0;
int argc = ZEND_NUM_ARGS();
if (zend_parse_parameters(argc TSRMLS_CC, "rs|l", &arg1, &addr,
&addr_len, &port) == FAILURE) {
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2.2.5.2.4&r2=1.70.2.2.2.5.2.5&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.4
php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.5
--- php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.5.2.4 Tue Jul 1 15:45:54 2008
+++ php-src/ext/sysvshm/sysvshm.c Tue Oct 21 23:39:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.4 2008/07/01 15:45:54 felipe Exp $ */
+/* $Id: sysvshm.c,v 1.70.2.2.2.5.2.5 2008/10/21 23:39:15 lbarnaud Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -145,8 +145,8 @@
Creates or open a shared memory segment */
PHP_FUNCTION(shm_attach)
{
- long arg_key, arg_size, arg_flag;
- long shm_size, shm_flag;
+ long arg_key, arg_size, arg_flag = 0;
+ long shm_size = 0, shm_flag;
sysvshm_shm *shm_list_ptr;
char *shm_ptr;
sysvshm_chunk_head *chunk_ptr;
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.18&r2=1.1.2.38.2.19&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.18
php-src/ext/zip/php_zip.c:1.1.2.38.2.19
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.18 Fri Aug 8 16:05:38 2008
+++ php-src/ext/zip/php_zip.c Tue Oct 21 23:39:15 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.1.2.38.2.18 2008/08/08 16:05:38 pajoye Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.19 2008/10/21 23:39:15 lbarnaud Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1184,8 +1184,8 @@
{
zval * zip;
zval * zip_entry;
- char *mode;
- int mode_len;
+ char *mode = NULL;
+ int mode_len = 0;
zip_read_rsrc * zr_rsrc;
zip_rsrc *z_rsrc;
@@ -1521,10 +1521,10 @@
struct zip *intern;
zval *this = getThis();
char *pattern;
- char *path;
+ char *path = NULL;
char *remove_path = NULL;
char *add_path = NULL;
- int pattern_len, add_path_len, remove_path_len, path_len;
+ int pattern_len, add_path_len, remove_path_len, path_len = 0;
long remove_all_path = 0;
long flags = 0;
zval *options = NULL;
@@ -2619,7 +2619,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.38.2.18 2008/08/08 16:05:38 pajoye Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.38.2.19 2008/10/21 23:39:15 lbarnaud Exp $");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING);
php_info_print_table_row(2, "Libzip version", "0.9.0");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
