1
0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Commit Graph

32831 Commits

Author SHA1 Message Date
Rasmus Lerdorf
73e65ea3c9 Merge branch 'PHP-5.5'
* PHP-5.5:
  These getpwnam('') tests are silly and not portable
2013-10-20 14:05:29 -07:00
Rasmus Lerdorf
2129de4569 These getpwnam('') tests are silly and not portable 2013-10-20 14:04:47 -07:00
Rasmus Lerdorf
7b2a4c168e Merge branch 'PHP-5.5'
* PHP-5.5:
  Clean up this weird safe_emalloc() call
2013-10-20 09:37:40 -07:00
Rasmus Lerdorf
288a4ec3bd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Clean up this weird safe_emalloc() call
2013-10-20 09:37:25 -07:00
Rasmus Lerdorf
8f4a6d6e1b Clean up this weird safe_emalloc() call 2013-10-20 09:36:50 -07:00
Rasmus Lerdorf
32a729a3ae Merge branch 'PHP-5.5'
* PHP-5.5:
  Minor Coverity tweaks
2013-10-20 08:56:41 -07:00
Rasmus Lerdorf
c5e5a6c2ac Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Minor Coverity tweaks
2013-10-20 08:56:24 -07:00
Rasmus Lerdorf
1494298231 Minor Coverity tweaks 2013-10-20 08:55:48 -07:00
Felipe Pena
048923b3c6 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Moved NULL check before dereferencing
2013-10-20 09:50:17 -02:00
Felipe Pena
8aa19c9fd8 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Moved NULL check before dereferencing
2013-10-20 09:50:13 -02:00
Felipe Pena
9976b5cd7f - Moved NULL check before dereferencing 2013-10-20 09:50:11 -02:00
Felipe Pena
d23f089fb9 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible NULL ptr dereference
2013-10-20 09:04:36 -02:00
Felipe Pena
5b0560efc3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible NULL ptr dereference
2013-10-20 09:04:27 -02:00
Felipe Pena
52555a7894 - Fixed possible NULL ptr dereference 2013-10-20 09:04:24 -02:00
Felipe Pena
b6feabc8c6 Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4 2013-10-20 08:52:31 -02:00
Felipe Pena
b7c64683da Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:27 -02:00
Felipe Pena
df31eb8fdc Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible uninitialized scalar variable usage (spotted by Coverity)
2013-10-20 08:51:17 -02:00
Felipe Pena
33d377e701 - Fixed possible uninitialized scalar variable usage (spotted by Coverity) 2013-10-20 08:51:09 -02:00
Rasmus Lerdorf
eb616f8c0f Merge branch 'PHP-5.5'
* PHP-5.5:
  Remove senseless check here
2013-10-19 20:57:02 -07:00
Rasmus Lerdorf
683a7d719b Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Remove senseless check here
2013-10-19 20:56:01 -07:00
Rasmus Lerdorf
fb38fdc7fd Remove senseless check here 2013-10-19 20:55:02 -07:00
Felipe Pena
ab7b0f9f43 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fix extern declaration according to definition
2013-10-20 01:16:15 -02:00
Felipe Pena
0d6247f968 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fix extern declaration according to definition
2013-10-20 01:16:10 -02:00
Felipe Pena
a1daebefda - Fix extern declaration according to definition 2013-10-20 01:16:07 -02:00
Felipe Pena
84011f7c32 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fix possible memory leak
2013-10-20 01:05:06 -02:00
Felipe Pena
8d22c23161 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fix possible memory leak
2013-10-20 01:05:00 -02:00
Felipe Pena
420068c6e1 - Fix possible memory leak 2013-10-20 01:04:55 -02:00
Felipe Pena
39e746a424 Merge branch 'PHP-5.5'
* PHP-5.5:
  - Moved allocation to if block to make Coverity happy
2013-10-19 23:36:41 -03:00
Felipe Pena
0b5c2887cd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Moved allocation to if block to make Coverity happy
2013-10-19 23:36:36 -03:00
Felipe Pena
85a622e42f - Moved allocation to if block to make Coverity happy 2013-10-19 23:36:28 -03:00
Felipe Pena
07361a4efc Merge branch 'PHP-5.5'
* PHP-5.5:
  - Fixed possible memory leak
2013-10-19 23:30:53 -03:00
Felipe Pena
c1f22176f3 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed possible memory leak
2013-10-19 23:30:12 -03:00
Felipe Pena
aa4f9b322b - Fixed possible memory leak 2013-10-19 23:29:34 -03:00
Rasmus Lerdorf
6650bed41c Merge branch 'PHP-5.5'
* PHP-5.5:
  Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:47 -07:00
Rasmus Lerdorf
1ce00048fd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix unitialized opened_path here - found by Coverity
2013-10-19 19:25:25 -07:00
Rasmus Lerdorf
2be67ca457 Fix unitialized opened_path here - found by Coverity 2013-10-19 19:24:17 -07:00
Rasmus Lerdorf
259c74654c Merge branch 'PHP-5.5'
* PHP-5.5:
  Trivial Coverity fix
2013-10-19 17:56:21 -07:00
Rasmus Lerdorf
4a205092f7 Trivial Coverity fix 2013-10-19 17:55:34 -07:00
Nikita Popov
9b46a15a6e Remove extraneous NULL check of Z_ARRVAL_P()
Z_ARRVAL_P() is never NULL
2013-10-19 23:52:23 +02:00
Nikita Popov
870d3e75ca Remove dead comparison (size_t < 0) 2013-10-19 23:46:09 +02:00
Nikita Popov
1292091670 Fix misleading sizeof
An array of zval* is allocated, but sizeof(zval **) is used.
Makes no practical difference as sizeof(zval *) == sizeof(zval **).
2013-10-19 23:43:05 +02:00
Xinchen Hui
e1f9993ba8 Merge branch 'PHP-5.5' 2013-10-19 22:19:11 +08:00
Xinchen Hui
d42fa2a059 Revert "Need a way to check whether this API exists"
hmm, we can check whether the head file exists instead

This reverts commit 4d7d85640d.
2013-10-19 22:18:37 +08:00
Xinchen Hui
b96bee6fdd Merge branch 'PHP-5.5' 2013-10-19 22:17:06 +08:00
Xinchen Hui
4d7d85640d Need a way to check whether this API exists 2013-10-19 22:16:31 +08:00
Rasmus Lerdorf
55b16f40a2 Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:43:21 -07:00
Rasmus Lerdorf
6919d15a2e Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:42:53 -07:00
Rasmus Lerdorf
adcd481ddf Merge branch 'pull-request/499'
Fix RFC 6598 IPv4 Reserved Range Checks
2013-10-19 00:01:13 -07:00
Michael Wallner
c86862cb3c Merge branch 'openssl_compile_warning_fix' of https://github.com/bukka/php-src
* 'openssl_compile_warning_fix' of https://github.com/bukka/php-src:
  Fix compiler warnings in openssl.c
2013-10-18 12:03:02 +02:00
Michael Wallner
a03b1328b8 fix compiler warnings and type usage 2013-10-18 11:34:24 +02:00