1
0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Commit Graph

63 Commits

Author SHA1 Message Date
Peter Kokot 03f3b8479b Sync leading and final newlines in source code files
This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2
2018-10-14 12:51:01 +02:00
Peter Kokot 7f6387b59a Trim trailing whitespace in source code files 2018-10-13 14:12:55 +02:00
Stanislav Malyshev 669763d88a More int->size_t and string overflow fixes 2016-11-05 13:22:17 -07:00
Stanislav Malyshev 6e12e49b5b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  More string length checks & fixes
2016-11-03 20:46:25 -07:00
Stanislav Malyshev ea9fac94bb More string length checks & fixes 2016-11-03 20:36:52 -07:00
Stanislav Malyshev b00f8f2a5b Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  Fix for bug #72513
  CS fix and comments with bug ID
  Fix for HTTP_PROXY issue.
  5.6.24RC1
  add tests for bug #72512
  Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
  Fixed bug #72479 - same as #72434

Conflicts:
	Zend/zend_virtual_cwd.c
	ext/bz2/bz2.c
	ext/exif/exif.c
	ext/session/session.c
	ext/snmp/snmp.c
	ext/standard/basic_functions.c
	main/SAPI.c
	main/php_variables.c
2016-07-19 01:39:28 -07:00
Stanislav Malyshev 4d0565b5ba Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
  fix #72519, possible OOB using imagegif
  fix #72512, invalid read or write for palette image when invalid transparent index is used
  Apparently some envs miss SIZE_MAX
  Fix tests
  Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment
  Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t
  Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c
  Fix for bug #72558, Integer overflow error within _gdContributionsAlloc()
  Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE
  Fix bug #72562 - destroy var_hash properly
  Fix bug #72533 (locale_accept_from_http out-of-bounds access)
  Fix fir bug #72520
  Fix for bug #72513
  CS fix and comments with bug ID
  Fix for HTTP_PROXY issue.
  add tests for bug #72512
  Fixed bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access
  Fixed bug #72479 - same as #72434

Conflicts:
	ext/bz2/bz2.c
	main/SAPI.c
	main/php_variables.c
2016-07-19 00:53:08 -07:00
Stanislav Malyshev 33c1a55b40 Apparently some envs miss SIZE_MAX 2016-07-19 00:13:25 -07:00
Stanislav Malyshev e6c48213c2 Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c 2016-07-18 21:44:39 -07:00
Anatol Belski e570bb430d fix snprintf redefinition in libxmlrpc under vc14 2015-05-10 22:22:02 +02:00
Stanislav Malyshev b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Anatol Belski bdeb220f48 first shot remove TSRMLS_* things 2014-12-13 23:06:14 +01:00
Veres Lajos 06fdf359e3 typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:52:47 -08:00
Veres Lajos 4dc994571d typo fixes - https://github.com/vlajos/misspell_fixer
Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c
2014-11-23 14:33:43 -08:00
Remi Collet 2bec5d18b7 Merge branch 'PHP-5.6'
* PHP-5.6:
  Ensure we have enough input data before parsing date
2014-10-28 08:51:22 +01:00
Remi Collet 13a218d328 Ensure we have enough input data before parsing date
This check have be removed in
http://git.php.net/?p=php-src.git;a=commit;h=ba2f87b50667f147c198abd31fc31eb09522f3d7
But the parser really need 17 char.
And the string need to be nul terminated for this check
So avoid reading random byte from memory.
2014-10-28 08:48:22 +01:00
Stanislav Malyshev 2b261789a6 Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-14 10:49:01 -07:00
Stanislav Malyshev 44035de79f Fix bug #68027 - fix date parsing in XMLRPC lib 2014-10-14 10:43:12 -07:00
Anatol Belski 784c235f40 missing include for strlen proto 2014-10-13 18:43:08 +02:00
Xinchen Hui b0329185cc Refactoring ext/xmlrpc (incompleted) 2014-05-12 19:28:06 +08:00
Veres Lajos 8d86597d73 non living code related typo fixes 2013-08-04 16:05:36 -07:00
Stanislav Malyshev ac40c0b562 Merge branch 'pull-request/341'
* pull-request/341: (23 commits)
  typofixes
2013-06-10 14:20:18 -07:00
Ilia Alshanetsky 5856a68c8d Removed unused variable 2008-12-17 00:30:27 +00:00
Ilia Alshanetsky 780ff63c37 MFH: Fixed bug #46746 (xmlrpc_decode_request outputs non-suppressable error
when given bad data).
2008-12-09 17:22:12 +00:00
Felipe Pena c818d0d013 MFH:
- Merged fix from SF project (Import Jeff Lawsons patches for XML datetime bug fixes)
  Fixed bugs:
  #45226 (xmlrpc_set_type() segfaults with valid ISO8601 date string)
  #18916 (xmlrpc_set_type() "not working")
2008-09-10 00:07:45 +00:00
Jani Taskinen b17dc14f18 MFH: nuketh C++ comments 2008-08-03 12:15:55 +00:00
Pierre Joye 53c53ed731 - MFH: silent redefinition warning 2008-07-05 18:17:37 +00:00
Stanislav Malyshev 1ef91c8494 limit iconv parameters here too 2007-09-19 00:33:43 +00:00
Ilia Alshanetsky 785b9d76f8 Fixed bug #42189 (xmlrpc_set_type() crashes php on invalid datetime
values).
2007-09-18 19:49:54 +00:00
Antony Dovgal 074b58b7f1 MFH: php_localtime_r() checks 2007-06-07 09:07:36 +00:00
Edin Kadribasic ee593ef3b1 Fix Windows Build 2007-05-03 04:16:32 +00:00
Ilia Alshanetsky ecf4e93630 Fixed bug #40703 (Resolved a possible namespace conflict between libxmlrpc
and MySQL's NDB table handler).
2007-03-04 18:24:49 +00:00
Stanislav Malyshev 43aa661c5e increase array size to fit buffer size 2007-02-23 21:14:52 +00:00
Antony Dovgal bccae9a134 MFH: fix #40576 (double values are truncated to 6 decimal digits when encoding) 2007-02-21 14:25:27 +00:00
Ilia Alshanetsky ca89b6dedd last set of zts fixes 2006-11-30 16:38:37 +00:00
Antony Dovgal d056376bba MFH: fix compile warnings (#38257) 2006-07-30 11:34:02 +00:00
foobar ae5204a02a MFH: - Fixed bug #35723 (xmlrpc_introspection.c fails compile per C99 std) 2005-12-18 22:59:57 +00:00
Antony Dovgal 8aedeb8513 tix fypo 2005-12-18 21:17:07 +00:00
Joe Orton 7c5f5697ce Fixed bug #32797 (invalid C code in xmlrpc extension). 2005-04-22 11:06:53 +00:00
Edin Kadribasic e923407cc5 Reshufle includes to make it compile on windows 2005-03-28 00:07:24 +00:00
foobar a8b29a2e8f - Made it possible to build ext/xmlrpc with libxml2 2005-03-26 03:13:58 +00:00
foobar 69eec3f3b9 MFB_4_3: Quote macro names in AC_DEFUN() 2004-12-30 07:08:39 +00:00
Ilia Alshanetsky 98a6986d97 Fixed bug #28597 (xmlrpc_encode_request() incorrectly encodes chars in
200-210 range).
Patch by: fernando dot nemec at folha dot com dot br
2004-06-01 20:16:06 +00:00
Ilia Alshanetsky 32321488ab Removed C++ style comments. 2004-04-27 17:33:59 +00:00
Ard Biesheuvel b703fe79f6 Fix warning 2004-03-08 23:04:33 +00:00
Ard Biesheuvel 1950bdd42c MFB fix #27408 2004-03-08 19:08:25 +00:00
foobar bb8b077ce7 Fix some compile warnings (patch by Joe Orton) 2003-12-16 21:00:21 +00:00
Frank M. Kromann 863962d5cf Adding missing header file on Win32 2002-11-26 23:02:09 +00:00
Frank M. Kromann 0cddc5b4eb removing unused variables 2002-11-26 23:01:17 +00:00
foobar faff3a6e8a kill some compile warnings 2002-08-22 01:25:52 +00:00