From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 29 Jan 2003 19:33:38 +0000 (+0000)
Subject: Added sanity checks.
X-Git-Tag: RELEASE_0_5~1369
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ebf13bc9405ee78ceb428fe7b9d47d29e68f44c4;p=php

Added sanity checks.
---

diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index b5f8ae8b53..6189949c72 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -111,6 +111,7 @@ EXEC SQL include sqlstype;
 #include <errno.h>
 
 typedef char IFX[128];
+#define SAFE_STRING(s) ((s)?(s):"")
 #define PHP_IFX_CHECK_CONNECTION(ifx)       \
         {                                   \
             if (ifx_check() < 0) {          \
@@ -451,7 +452,7 @@ EXEC SQL END DECLARE SECTION;
 
 		hashed_details_length = sizeof("ifx___") - 1 + host_len + user_len + passwd_len;
 		hashed_details = (char *) emalloc(hashed_details_length+1);
-		sprintf(hashed_details,"ifx_%s_%s_%s", host, user, passwd);
+		sprintf(hashed_details,"ifx_%s_%s_%s", SAFE_STRING(host), SAFE_STRING(user), SAFE_STRING(passwd));
 	}
 
 	IFXG(sv_sqlcode) = 0;
@@ -480,7 +481,7 @@ EXEC SQL END DECLARE SECTION;
 			/* create the link */
 			ifx = (char *) malloc(sizeof(IFX));
 			IFXG(connectionid)++;
-			sprintf(ifx,"%s%x", user, IFXG(connectionid));
+			sprintf(ifx,"%s%x", SAFE_STRING(user), IFXG(connectionid));
 			
 			EXEC SQL CONNECT TO :host AS :ifx USER :user USING :passwd WITH CONCURRENT TRANSACTION;