From: Stanislav Malyshev <stas@php.net>
Date: Wed, 16 May 2012 05:34:34 +0000 (-0700)
Subject: fix bug #61065
X-Git-Tag: php-5.4.4RC2~71
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a10e778bfb7ce9caa1f91666ddf2705db7982d68;p=php

fix bug #61065
---

diff --git a/ext/phar/tar.c b/ext/phar/tar.c
index 9d1e5bcb1d..b914db129e 100644
--- a/ext/phar/tar.c
+++ b/ext/phar/tar.c
@@ -337,6 +337,16 @@ bail:
 			last_was_longlink = 1;
 			/* support the ././@LongLink system for storing long filenames */
 			entry.filename_len = entry.uncompressed_filesize;
+
+			/* Check for overflow - bug 61065 */
+			if (entry.filename_len == UINT_MAX) {
+				if (error) {
+					spprintf(error, 4096, "phar error: \"%s\" is a corrupted tar file (invalid entry size)", fname);
+				}
+				php_stream_close(fp);
+				phar_destroy_phar_data(myphar TSRMLS_CC);
+				return FAILURE;
+			}
 			entry.filename = pemalloc(entry.filename_len+1, myphar->is_persistent);
 
 			read = php_stream_read(fp, entry.filename, entry.filename_len);