Merge lp:~clint-fewbar/ubuntu/natty/php5/fix-mssql-segfault into lp:ubuntu/natty/php5

[Clint Byrum]

Merged with latest natty, and changed patch to the actual patch that was used upstream.

[Artur Rona (ari-tczew)]

Please remove added blank line at the end of debian/changelog.
Please use short URLs in DEP3 tags, so:
Bug: http://bugs.php.net/52843
Bug-Ubuntu: https://launchpad.net/bugs/611316

review: Needs Fixing

[lp:~clint-fewbar/ubuntu/natty/php5/fix-mssql-segfault]

76. By Clint Byrum on 2010-12-04

- removing blank line on changelog
- using short bug urls

[Clint Byrum (clint-fewbar)]

Artur, thanks for the review.

Just pushed up revno 76, should address those issues.

Can you point me to where the DEP-3 guidelines are? I was going by these:

http://dep.debian.net/deps/dep3/

Which does not mention short urls.

[Artur Rona (ari-tczew)]

Maybe this is not required by DEP3 policy, but this is elegant and nice data. We prefer to use short URLs to make DEP3 tags as small as possible. You can find short URL on DEP3 tags site under samples (Bug-Debian is short).

From policy hand, looks good. Let's check building... FTBFS!

Applying patch mssql_fix_segfault.patch
patching file ext/mssql/php_mssql.c
Hunk #1 FAILED at 539.
1 out of 1 hunk FAILED -- rejects in file ext/mssql/php_mssql.c
Patch mssql_fix_segfault.patch does not apply (enforce with -f)
make: *** [debian/stamp-patched] Error 1
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package

Please check whether other patches do something on file ext/mssql/php_mssql.c.

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Artur, again thanks for all the clarification and testing. I normally would have rebuilt before pushing but was in a rush on Friday, so apologies for wasting your time.

Ok, I refreshed the patch, and re-ran the test case of php -r 'mssql_connect("");', it works properly in natty. Pushed up to the branch.

review: Resubmit

[lp:~clint-fewbar/ubuntu/natty/php5/fix-mssql-segfault]

77. By Clint Byrum on 2010-12-06

refreshing patch

[Kees Cook (kees)]

This looks pretty good to me. I've further adjusted the patch DEP3 and changelog so that is is 80-character wrapped, and doesn't contain blank lines in the patch header.

Thanks for the patch, and the reviews!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-24 10:44:36 +0000
+++ debian/changelog	2010-12-06 15:55:34 +0000
@@ -1,3 +1,10 @@
+php5 (5.3.3-1ubuntu11) natty; urgency=low
+
+  * debian/patches/mssql-fix-segfault.patch: Fixes segfault on missing parameters
+    for mssql. upstream php bug #52843 and (LP: #611316)
+
+ -- Clint Byrum <[e-mail]>  Fri, 03 Dec 2010 23:45:19 -0800
+
 php5 (5.3.3-1ubuntu10) natty; urgency=low
 
   * debian/patches/configure-as-needed.patch. Work around suspicious

=== added file 'debian/patches/mssql_fix_segfault.patch'
--- debian/patches/mssql_fix_segfault.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/mssql_fix_segfault.patch	2010-12-06 15:55:34 +0000
@@ -0,0 +1,22 @@
+From: Clint Byrum <[e-mail]>
+Subject: Fix segfault on omitted optional parameters for mssql_connect()
+
+* ext/mssql/php_mssql.c: Initialize lengths to prevent segfaults
+
+Origin: http://svn.php.net/viewvc/php/php-src/branches/PHP_5_3/ext/mssql/php_mssql.c?r1=303375&r2=303374&pathrev=303375
+Bug: http://bugs.php.net/52843
+Bug-Ubuntu: https://launchpad.net/bugs/611316
+
+Index: fix-mssql-segfault/ext/mssql/php_mssql.c
+===================================================================
+--- fix-mssql-segfault.orig/ext/mssql/php_mssql.c	2010-12-06 06:00:32.000000000 -0800
++++ fix-mssql-segfault/ext/mssql/php_mssql.c	2010-12-06 06:01:39.101694001 -0800
+@@ -571,7 +571,7 @@
+ static void php_mssql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
+ {
+ 	char *host = NULL, *user = NULL, *passwd = NULL;
+-	int host_len, user_len, passwd_len;
++	int host_len = 0, user_len = 0, passwd_len = 0;
+ 	zend_bool new_link = 0;
+ 	char *hashed_details;
+ 	int hashed_details_length;

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-24 10:44:36 +0000
+++ debian/patches/series	2010-12-06 15:55:34 +0000
@@ -58,3 +58,4 @@
 lp564920-fix-big-files.patch
 CVE-2010-2950.patch
 configure-as-needed.patch
+mssql_fix_segfault.patch