Fix failure of new wchar->mb functions to advance from pointer.

robertmhaas · robertmhaas · commit f6a05fd973a1 · 2012-07-05T23:47:53.000-04:00
Bug spotted by Tom Lane.
diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c
@@ -380,6 +380,7 @@ pg_wchar2euc_with_len(const pg_wchar *from, unsigned char *to, int len)
 			*to++ = *from;
 			cnt++;
 		}		
+		from++;
 		len--;
 	}
 	*to = 0;
@@ -518,9 +519,10 @@ pg_wchar2utf_with_len(const pg_wchar *from, unsigned char *to, int len)
 		
 		unicode_to_utf8(*from, to);
 		char_len = pg_utf_mblen(to);
-		len--;
 		cnt += char_len;
 		to += char_len;
+		from++;
+		len--;
 	}
 	*to = 0;
 	return cnt;
@@ -854,6 +856,7 @@ pg_wchar2mule_with_len(const pg_wchar *from, unsigned char *to, int len)
 			*to++ = lb;
 			cnt += 1;
 		}
+		from++;
 		len--;
 	}
 	*to = 0;

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,7 @@ pg_wchar2euc_with_len(const pg_wchar from, unsigned char to, int len)`
`380`	`380`	`to++ = from;`
`381`	`381`	`cnt++;`
`382`	`382`	`}`
	`383`	`+ from++;`
`383`	`384`	`len--;`
`384`	`385`	`}`
`385`	`386`	`*to = 0;`
`@@ -518,9 +519,10 @@ pg_wchar2utf_with_len(const pg_wchar from, unsigned char to, int len)`
`518`	`519`
`519`	`520`	`unicode_to_utf8(*from, to);`
`520`	`521`	`char_len = pg_utf_mblen(to);`
`521`		`- len--;`
`522`	`522`	`cnt += char_len;`
`523`	`523`	`to += char_len;`
	`524`	`+ from++;`
	`525`	`+ len--;`
`524`	`526`	`}`
`525`	`527`	`*to = 0;`
`526`	`528`	`return cnt;`
`@@ -854,6 +856,7 @@ pg_wchar2mule_with_len(const pg_wchar from, unsigned char to, int len)`
`854`	`856`	`*to++ = lb;`
`855`	`857`	`cnt += 1;`
`856`	`858`	`}`
	`859`	`+ from++;`
`857`	`860`	`len--;`
`858`	`861`	`}`
`859`	`862`	`*to = 0;`