summaryrefslogtreecommitdiff
path: root/main/rfc1867.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 /main/rfc1867.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 'main/rfc1867.c')
-rw-r--r--main/rfc1867.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/rfc1867.c b/main/rfc1867.c
index ed7ce9c0c1..7c208c368c 100644
--- a/main/rfc1867.c
+++ b/main/rfc1867.c
@@ -398,7 +398,7 @@ static int find_boundary(multipart_buffer *self, char *boundary TSRMLS_DC)
static int multipart_buffer_headers(multipart_buffer *self, zend_llist *header TSRMLS_DC)
{
char *line;
- mime_header_entry prev_entry, entry;
+ mime_header_entry prev_entry = {0}, entry;
int prev_len, cur_len;
/* didn't find boundary, abort */