archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

Browse source
This commit is contained in:
Pierre Joye 2013-05-15 15:53:57 +02:00
commit 09470ebf35
6 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -5,6 +5,9 @@ PHP NEWS
- Core: - Core:
. Fixed bug #64729 (compilation failure on x32). (Gustavo) . Fixed bug #64729 (compilation failure on x32). (Gustavo)
- Fileinfo:
. Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)
- FPM: - FPM:
. Ignore QUERY_STRING when sent in SCRIPT_FILENAME. (Remi) . Ignore QUERY_STRING when sent in SCRIPT_FILENAME. (Remi)
. Fixed some possible memory or resource leaks and possible null dereference . Fixed some possible memory or resource leaks and possible null dereference

10
ext/fileinfo/libmagic.patch
View file

@ -2978,7 +2978,7 @@ diff -u libmagic.orig/readelf.h libmagic/readelf.h
typedef uint8_t Elf64_Char; typedef uint8_t Elf64_Char;
diff -u libmagic.orig/softmagic.c libmagic/softmagic.c diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
--- libmagic.orig/softmagic.c 2013-03-21 18:45:14.000000000 +0100 --- libmagic.orig/softmagic.c 2013-03-21 18:45:14.000000000 +0100
+++ libmagic/softmagic.c 2013-04-08 15:42:57.328298809 +0200 +++ libmagic/softmagic.c 2013-05-14 11:00:07.044745939 +0200
@@ -41,6 +41,11 @@ @@ -41,6 +41,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
@ -3123,7 +3123,7 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
} }
} }
@@ -1717,9 +1694,9 @@ @@ -1717,12 +1694,12 @@
ms->o.buf = sbuf; ms->o.buf = sbuf;
ms->offset = soffset; ms->offset = soffset;
if (rv == 1) { if (rv == 1) {
@ -3134,7 +3134,11 @@ diff -u libmagic.orig/softmagic.c libmagic/softmagic.c
+ return -1; + return -1;
if (file_printf(ms, "%s", rbuf) == -1) if (file_printf(ms, "%s", rbuf) == -1)
return -1; return -1;
free(rbuf); - free(rbuf);
+ efree(rbuf);
}
return rv;
@@ -1837,6 +1814,42 @@ @@ -1837,6 +1814,42 @@
return file_strncmp(a, b, len, flags); return file_strncmp(a, b, len, flags);
} }

2
ext/fileinfo/libmagic/softmagic.c
View file

@ -1699,7 +1699,7 @@ mget(struct magic_set *ms, const unsigned char *s, struct magic *m,
return -1; return -1;
if (file_printf(ms, "%s", rbuf) == -1) if (file_printf(ms, "%s", rbuf) == -1)
return -1; return -1;
free(rbuf); efree(rbuf);
} }
return rv; return rv;

4
ext/fileinfo/tests/finfo_file_002.phpt
View file

@ -18,7 +18,7 @@ ksort($results);
var_dump($results); var_dump($results);
?> ?>
--EXPECTF-- --EXPECTF--
array(7) { array(8) {
["%s/resources/dir.zip"]=> ["%s/resources/dir.zip"]=>
string(15) "application/zip" string(15) "application/zip"
["%s/resources/test.awk"]=> ["%s/resources/test.awk"]=>
@ -29,6 +29,8 @@ array(7) {
string(9) "image/gif" string(9) "image/gif"
["%s/resources/test.jpg"]=> ["%s/resources/test.jpg"]=>
string(10) "image/jpeg" string(10) "image/jpeg"
["%s/resources/test.mp3"]=>
string(10) "audio/mpeg"
["%s/resources/test.pdf"]=> ["%s/resources/test.pdf"]=>
string(15) "application/pdf" string(15) "application/pdf"
["%s/resources/test.png"]=> ["%s/resources/test.png"]=>

BIN
ext/fileinfo/tests/resources/test.mp3 Normal file
View file

Binary file not shown.

2
ext/mysql/php_mysql.c
View file

@ -720,7 +720,7 @@ PHP_MINFO_FUNCTION(mysql)
static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
{ {
char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL; char *user=NULL, *passwd=NULL, *host_and_port=NULL, *socket=NULL, *tmp=NULL, *host=NULL;
int user_len, passwd_len, host_len; int user_len = 0, passwd_len = 0, host_len = 0;
char *hashed_details=NULL; char *hashed_details=NULL;
int hashed_details_length, port = MYSQL_PORT; int hashed_details_length, port = MYSQL_PORT;
long client_flags = 0; long client_flags = 0;