database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-24 10:47:04 +03:00
Code

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

Browse Source 
Bug spotted by Tom Lane.
This commit is contained in:
Robert Haas 2012-07-05 23:47:53 -04:00
parent 2eeb5eb23f
commit f6a05fd973
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/utils/mb/wchar.c
View File

@ -380,6 +380,7 @@ pg_wchar2euc_with_len(const pg_wchar *from, unsigned char *to, int len)
*to++ = *from; *to++ = *from;
cnt++; cnt++;
} }
from++;
len--; len--;
} }
*to = 0; *to = 0;
@ -518,9 +519,10 @@ pg_wchar2utf_with_len(const pg_wchar *from, unsigned char *to, int len)
unicode_to_utf8(*from, to); unicode_to_utf8(*from, to);
char_len = pg_utf_mblen(to); char_len = pg_utf_mblen(to);
len--;
cnt += char_len; cnt += char_len;
to += char_len; to += char_len;
from++;
len--;
} }
*to = 0; *to = 0;
return cnt; return cnt;
@ -854,6 +856,7 @@ pg_wchar2mule_with_len(const pg_wchar *from, unsigned char *to, int len)
*to++ = lb; *to++ = lb;
cnt += 1; cnt += 1;
} }
from++;
len--; len--;
} }
*to = 0; *to = 0;