summaryrefslogtreecommitdiff
path: root/ext/session/session.c
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-14 20:43:25 -0700
committerChristopher Jones <sixd@php.net>2013-08-14 20:43:25 -0700
commit39612afc72623e89a2bc595c9be4be497568d1be (patch)
treeba336742c4b5ad3d4c8933748b91332f7436aa66 /ext/session/session.c
parent8c61758dc772345636e436e3f69bef7323f8b339 (diff)
parent9ad97cd48903ea5454853960f2c14de326e0f624 (diff)
downloadphp-git-39612afc72623e89a2bc595c9be4be497568d1be.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. Conflicts: ext/dba/libinifile/inifile.c
Diffstat (limited to 'ext/session/session.c')
-rw-r--r--ext/session/session.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/session/session.c b/ext/session/session.c
index 5fdb42b04b..7c6672de52 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -286,7 +286,7 @@ PHPAPI char *php_session_create_id(PS_CREATE_SID_ARGS) /* {{{ */
PHP_MD5_CTX md5_context;
PHP_SHA1_CTX sha1_context;
#if defined(HAVE_HASH_EXT) && !defined(COMPILE_DL_HASH)
- void *hash_context;
+ void *hash_context = NULL;
#endif
unsigned char *digest;
int digest_len;