Fix NULL dereferences which causes application crash. Patch by Tsunakawa, Takayuki.

1 files changed, 9 insertions, 3 deletions

diff --git a/setup.c b/setup.c
index 77b38d3..e70d3be 100644
--- a/setup.c
+++ b/setup.c
@@ -486,12 +486,18 @@ cleanup:
 
 		tlen = strlen(emsg);
 		wermsg = (SQLWCHAR *) malloc(sizeof(SQLWCHAR) * (tlen + 1));
-		ulen = utf8_to_ucs2_lf(emsg, SQL_NTS, FALSE, wermsg, tlen + 1, TRUE);
+		if (wermsg)
+			ulen = utf8_to_ucs2_lf(emsg, SQL_NTS, FALSE, wermsg, tlen + 1, TRUE);
+		else
+			ulen = (SQLULEN) -1;
 		if (ulen != (SQLULEN) -1)
 		{
 			allocstr = malloc(4 * tlen + 1);
-			(void) wstrtomsg(wermsg, (int) tlen, allocstr, (int) (4 * tlen + 1));
-			emsg = allocstr;
+			if (allocstr)
+			{
+				(void) wstrtomsg(wermsg, (int) tlen, allocstr, (int) (4 * tlen + 1));
+				emsg = allocstr;
+			}
 		}
 #endif /* UNICODE_SUPPORT */