Fix an infinite loop in utf8_to_ucs2().

diff --git a/version.h b/version.h
index a87a04e0750a36e8b28a8c5d3f7f051dba14c3ab..15e0bd572fa9b7c02841d8650d987c2c24ce2f0b 100644 (file)
--- a/version.h
+++ b/version.h
@@ -12,6 +12,6 @@
 #define POSTGRESDRIVERVERSION      "08.03.0402"
 #define POSTGRES_RESOURCE_VERSION  "08.03.0402\0"
 #define PG_DRVFILE_VERSION     8,3,04,02
-#define PG_BUILD_VERSION       "200904040004"
+#define PG_BUILD_VERSION       "200904040005"
 
 #endif

diff --git a/win_unicode.c b/win_unicode.c
index 9b3d6076a0ce3dc121d0e02652daaec72c7e4c5a..e7d2a1e79f45674a64f944b3aa97d81aeb47ad54 100644 (file)
--- a/win_unicode.c
+++ b/win_unicode.c
@@ -288,7 +288,10 @@ SQLULEN    utf8_to_ucs2_lf##errcheck(const char *utf8str, SQLLEN ilen, BOOL lfconv,
            str += 2; \
        } \
        else \
+       { \
            ocount = (SQLULEN) -1; \
+           goto cleanup; \
+       } \
    } \
 cleanup: \
    rtn = ocount; \