Merge fix for SQLPutData

Author: freddy77

configure.ac

@@ -11,7 +11,7 @@ dnl ------------------------------------------------------------
 # ------------------------------------------------------------
 # Initialization
 # ------------------------------------------------------------
-AC_INIT(FreeTDS, 1.5.6)
+AC_INIT(FreeTDS, 1.5.7)
 AC_CONFIG_SRCDIR(src/dblib/dblib.c)
 AC_PREREQ(2.53)
 

include/freetds/iconv.h

@@ -22,6 +22,12 @@
 
 #if HAVE_ICONV
 #include <iconv.h>
+/* avoid conflict with win-iconv library */
+#if defined(_LIBICONV_H) && defined(WINICONV_CONST)
+#undef libiconv_open
+#undef libiconv_close
+#undef libiconv
+#endif
 #else
 /* Define iconv_t for src/replacements/iconv.c. */
 #undef iconv_t

misc/appveyor.yml

@@ -23,7 +23,7 @@ environment:
     # /E:ON and /V:ON options are not enabled in the batch script intepreter
     # See: http://stackoverflow.com/a/13751649/163740
     WITH_COMPILER: "cmd /E:ON /V:ON /C ..\\misc\\run_with_compiler.cmd"
-    WIN_ICONV_VER: fixed
+    WIN_ICONV_VER: master
 
   matrix:
   - PLAT: Win64
@@ -80,14 +80,14 @@ install:
   - ren win-iconv-%WIN_ICONV_VER% iconv
   - mkdir iconv-build
   - cd iconv-build
-  - "%WITH_COMPILER% cmake -G \"NMake Makefiles\" -DBUILD_STATIC=on -D BUILD_SHARED=off -DBUILD_EXECUTABLE=off -DBUILD_TEST=on -DCMAKE_BUILD_TYPE=Release ..\\iconv"
+  - "%WITH_COMPILER% cmake -G \"NMake Makefiles\" -DWIN_ICONV_BUILD_STATIC=on -DWIN_ICONV_BUILD_SHARED=off -DWIN_ICONV_BUILD_EXECUTABLE=off -DWIN_ICONV_BUILD_TEST=on -DDISABLE_LOCALE_CHARSET=on -DCMAKE_BUILD_TYPE=Release ..\\iconv"
   - "%WITH_COMPILER% nmake"
   - win_iconv_test.exe
   - cd ..\iconv
   - mkdir include
   - mkdir lib
   - copy iconv.h include
-  - copy ..\iconv-build\iconv.lib lib
+  - copy ..\iconv-build\libiconv.lib lib\iconv.lib
   - cd ..
   # if cache doesn't have it, download it
   - >

src/odbc/prepare_query.c

@@ -364,8 +364,10 @@ continue_parse_prepared_query(struct _hstmt *stmt, SQLPOINTER DataPtr, SQLLEN St
 		break;
 	}
 
-	if (!blob && len > need_bytes)
-		len = need_bytes;
+	if (!blob && len > need_bytes) {
+		odbc_errs_add(&stmt->errs, "22001", NULL);
+		return SQL_ERROR;
+	}
 
 	/* copy to destination */
 	if (blob) {

src/odbc/sql2tds.c

@@ -425,10 +425,16 @@ odbc_sql2tds(TDS_STMT * stmt, const struct _drecord *drec_ixd, const struct _dre
 			len = SQL_LEN_DATA_AT_EXEC(sql_len);
 			need_data = true;
 
-			/* dynamic length allowed only for BLOB fields */
+			/* dynamic length allowed only for variable fields */
 			switch (drec_ixd->sql_desc_concise_type) {
+			case SQL_CHAR:
+			case SQL_VARCHAR:
 			case SQL_LONGVARCHAR:
+			case SQL_WCHAR:
+			case SQL_WVARCHAR:
 			case SQL_WLONGVARCHAR:
+			case SQL_BINARY:
+			case SQL_VARBINARY:
 			case SQL_LONGVARBINARY:
 				break;
 			default:

src/odbc/unittests/putdata.c

@@ -225,14 +225,59 @@ Test(int direct)
 	/* TODO test cancel inside SQLExecute */
 }
 
+static void
+TestOverflow(void)
+{
+	SQLLEN ind;
+	SQLPOINTER ptr;
+
+	odbc_command_with_result(odbc_stmt, "DROP TABLE #putdata");
+	odbc_command("CREATE TABLE #putdata (c VARCHAR(255) NULL)");
+
+	CHKBindParameter(1, SQL_PARAM_INPUT, SQL_C_CHAR, SQL_VARCHAR, 30, 0, (SQLPOINTER) 123, 0, &ind, "S");
+	/* length required */
+	ind = SQL_DATA_AT_EXEC;
+
+	CHKExecDirect(T("INSERT INTO #putdata(c) VALUES(?)"), SQL_NTS, "Ne");
+
+	ptr = ((char*)0) + 0xdeadbeef;
+	CHKParamData(&ptr, "Ne");
+	if (ptr != (SQLPOINTER) 123) {
+		fprintf(stderr, "%p\n", ptr);
+		ODBC_REPORT_ERROR("Wrong pointer from SQLParamData");
+	}
+	CHKPutData((void *)test_text, 25, "S");
+	CHKPutData((void *)test_text, 6, "E");
+	odbc_read_error();
+	if (strcmp(odbc_sqlstate, "22001") != 0) {
+		fprintf(stderr, "Unexpected sql state %s returned\n", odbc_sqlstate);
+		odbc_disconnect();
+		exit(1);
+	}
+
+	/* This error is reported by the Driver Manager */
+#ifndef TDS_NO_DM
+	CHKParamData(&ptr, "E");
+	odbc_read_error();
+	if (strcmp(odbc_sqlstate, "HY010") != 0) {
+		fprintf(stderr, "Unexpected sql state %s returned\n", odbc_sqlstate);
+		odbc_disconnect();
+		exit(1);
+	}
+#endif
+}
+
 int
 main(void)
 {
+	odbc_use_version3 = 1;
 	odbc_connect();
 
 	Test(0);
 	Test(1);
 
+	TestOverflow();
+
 	odbc_disconnect();
 
 	printf("Done.\n");