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

[Clint Byrum]

Fixes segfault, tested on maverick.

[Barry Warsaw (barry)]

Hi Clint, great work on following up with this bug. While your patch is certainly reasonable, it differs from what upstream applied: http://svn.php.net/viewvc/php/php-src/trunk/ext/mssql/php_mssql.c?r1=303375&r2=303374&pathrev=303375

Would it make more sense to use their change for consistency? It's also a somewhat simpler change (and probably what I would have done :).

review: Needs Fixing

[Clint Byrum (clint-fewbar)]

Funny, I just noticed yesterday that upstream had patched it in a different and more elegant way.

I'll update the MP ASAP, thanks for the review Barry!

Unmerged revisions

72. By Clint Byrum on 2010-09-14

debian/patches/mssql-fix-segfault.patch: Fixes segfault on missing parameters
for mssql. upstream php bug #52843 and (LP: #611316)

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-25 14:04:57 +0000
+++ debian/changelog	2010-09-14 21:49:48 +0000
@@ -1,3 +1,10 @@
+php5 (5.3.3-1ubuntu7) maverick; 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]>  Tue, 14 Sep 2010 14:37:37 -0700
+
 php5 (5.3.3-1ubuntu6) maverick; urgency=low
 
   * Undo sybase debugging libraries split: keeping a smaller delta with Debian

=== 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-09-14 21:49:48 +0000
@@ -0,0 +1,28 @@
+From: Clint Byrum <[e-mail]>
+Subject: Fix segfault on omitted optional parameters for mssql_connect()
+
+* ext/mssql/php_mssql.c: Add checks for null pointers before dereferencing
+
+Author: Clint Byrum <[e-mail]>
+Bug: http://bugs.php.net/bug.php?id=52843
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/611316
+
+--- a/ext/mssql/php_mssql.c
++++ b/ext/mssql/php_mssql.c
+@@ -551,13 +551,13 @@
+ 	}
+ 
+ 	/* Limit strings to 255 chars to prevent overflow issues in underlying libraries */
+-	if(host_len>255) {
++	if(host && host_len>255) {
+ 		host[255] = '\0';
+ 	}
+-	if(user_len>255) {
++	if(user && user_len>255) {
+ 		user[255] = '\0';
+ 	}
+-	if(passwd_len>255) {
++	if(passwd && passwd_len>255) {
+ 		passwd[255] = '\0';
+ 	}
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-13 00:07:15 +0000
+++ debian/patches/series	2010-09-14 21:49:48 +0000
@@ -57,3 +57,4 @@
 fpm-config.patch
 lp564920-fix-big-files.patch
 php52389-pgsql-segfault.patch
+mssql_fix_segfault.patch