Revert "fix length read from app ptr when param binding (#173)"

This reverts commit 69243d4.

Author: bpintea

driver/convert.c

@@ -3210,6 +3210,7 @@ static BOOL xstr_to_number(esodbc_stmt_st *stmt, void *data_ptr,
 SQLRETURN c2sql_null(esodbc_rec_st *arec,
 	esodbc_rec_st *irec, char *dest, size_t *len)
 {
+	assert(irec->concise_type == ESODBC_SQL_NULL);
 	if (dest) {
 		memcpy(dest, JSON_VAL_NULL, sizeof(JSON_VAL_NULL) - /*\0*/1);
 	}
@@ -4120,37 +4121,6 @@ SQLRETURN c2sql_interval(esodbc_rec_st *arec, esodbc_rec_st *irec,
 #	undef ASSIGN_SIGNED
 }
 
-static inline SQLLEN get_octet_len(SQLLEN *octet_len_ptr, void *data_ptr,
-	BOOL wide)
-{
-	SQLLEN cnt;
-
-	assert(data_ptr);
-
-	if (! octet_len_ptr) {
-		/* "If [...] is a null pointer, the driver assumes that all input
-		 * parameter values are non-NULL and that character and binary data is
-		 * null-terminated." */
-		cnt = wide ? wcslen((wchar_t *)data_ptr) : strlen((char *)data_ptr);
-	} else {
-		cnt = *octet_len_ptr;
-		switch (cnt) {
-			case SQL_NTSL:
-				cnt = wide ? wcslen((wchar_t *)data_ptr) :
-					strlen((char *)data_ptr);
-				break;
-			case SQL_NULL_DATA:
-				BUG("converting SQL_NULL_DATA");
-				cnt = -1; /* UTF16/8 will fail */
-				break;
-			default: /* get characters count from octets count */
-				cnt /= wide ? sizeof(SQLWCHAR) : sizeof(SQLCHAR);
-		}
-	}
-
-	return cnt;
-}
-
 static SQLRETURN c2sql_cstr2qstr(esodbc_rec_st *arec, esodbc_rec_st *irec,
 	SQLULEN pos, char *dest, size_t *len)
 {
@@ -4163,7 +4133,7 @@ static SQLRETURN c2sql_cstr2qstr(esodbc_rec_st *arec, esodbc_rec_st *irec,
 	/* pointer to app's buffer */
 	data_ptr = deferred_address(SQL_DESC_DATA_PTR, pos, arec);
 
-	cnt = get_octet_len(octet_len_ptr, data_ptr, /*wide*/FALSE);
+	cnt = octet_len_ptr ? *octet_len_ptr : strlen((char *)data_ptr);
 
 	if (dest) {
 		*dest = '"';
@@ -4197,7 +4167,7 @@ static SQLRETURN c2sql_wstr2qstr(esodbc_rec_st *arec, esodbc_rec_st *irec,
 	/* pointer to app's buffer */
 	data_ptr = deferred_address(SQL_DESC_DATA_PTR, pos, arec);
 
-	cnt = get_octet_len(octet_len_ptr, data_ptr, /*wide*/TRUE);
+	cnt = octet_len_ptr ? *octet_len_ptr : wcslen((wchar_t *)data_ptr);
 
 	if (dest) {
 		*dest = '"';
@@ -4216,7 +4186,7 @@ static SQLRETURN c2sql_wstr2qstr(esodbc_rec_st *arec, esodbc_rec_st *irec,
 		octets = WCS2U8((wchar_t *)data_ptr, (int)cnt, dest + !!dest,
 				dest ? INT_MAX : 0);
 		if ((err = GetLastError())) {
-			ERRH(stmt, "converting to multibyte string failed: 0x%x", err);
+			ERRH(stmt, "converting to multibyte string failed: %d", err);
 			RET_HDIAGS(stmt, SQL_STATE_HY000);
 		}
 	} else {

test/test_conversion_c2sql_null.cc

@@ -141,21 +141,6 @@ TEST_F(ConvertC2SQL_Varchar, WStr2Varchar_ansi_jsonescape)
 	ASSERT_CSTREQ(buff, expect);
 }
 
-TEST_F(ConvertC2SQL_Varchar, CStr2Varchar_jsonescape_oct_len_ptr)
-{
-	prepareStatement();
-
-	SQLCHAR val[] = "START_{xxx}=\"yyy\"\r__END";
-	SQLLEN octet_len = strlen((char *)val);
-	ret = SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_CHAR,
-			SQL_VARCHAR, /*size*/35, /*decdigits*/0, val, sizeof(val),
-			&octet_len);
-	ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-	//assertRequest("[{\"type\": \"KEYWORD\", "
-	//	"\"value\": \"START_{xxx}=\\\"yyy\\\"\\r__END\"}]");
-}
-
 /* note: test name used in test */
 TEST_F(ConvertC2SQL_Varchar, CStr2Varchar_jsonescape)
 {
@@ -204,21 +189,6 @@ TEST_F(ConvertC2SQL_Varchar, WStr2Varchar_u8_jsonescape)
 	ASSERT_CSTREQ(buff, expect);
 }
 
-TEST_F(ConvertC2SQL_Varchar, WStr2Varchar_u8_fullescape_oct_len_ptr)
-{
-	prepareStatement();
-
-	SQLWCHAR val[] = L"äöüÄÖÜ";
-	SQLLEN octet_len = SQL_NTSL;
-	ret = SQLBindParameter(stmt, 1, SQL_PARAM_INPUT, SQL_C_WCHAR,
-			SQL_VARCHAR, /*size*/35, /*decdigits*/0, val, sizeof(val),
-			&octet_len);
-	ASSERT_TRUE(SQL_SUCCEEDED(ret));
-
-	//assertRequest("[{\"type\": \"KEYWORD\", "
-	//	"\"value\": \"\u00E4\u00F6\u00FC\u00C4\u00D6\u00DC\"}]");
-}
-
 /* note: test name used in test */
 TEST_F(ConvertC2SQL_Varchar, WStr2Varchar_u8_fullescape)
 {