database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-31 17:02:12 +03:00
Code Activity

Fix text_position to not scan past end of source string in multibyte

Browse Source 
case, per report from Korea PostgreSQL Users' Group.
This commit is contained in:
Tom Lane
2004-01-31 00:45:34 +00:00
parent 94189c9fc9
commit 871e56709d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/utils/adt/varlena.c
View File

@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.106.2.2 2003/12/19 04:56:54 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/adt/varlena.c,v 1.106.2.3 2004/01/31 00:45:34 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -761,9 +761,6 @@ text_position(Datum str, Datum search_str, int matchnum)
len1 = (VARSIZE(t1) - VARHDRSZ); len1 = (VARSIZE(t1) - VARHDRSZ);
len2 = (VARSIZE(t2) - VARHDRSZ); len2 = (VARSIZE(t2) - VARHDRSZ);
/* no use in searching str past point where search_str will fit */
px = (len1 - len2);
if (eml == 1) /* simple case - single byte encoding */ if (eml == 1) /* simple case - single byte encoding */
{ {
char *p1, char *p1,
@@ -772,6 +769,9 @@ text_position(Datum str, Datum search_str, int matchnum)
p1 = VARDATA(t1); p1 = VARDATA(t1);
p2 = VARDATA(t2); p2 = VARDATA(t2);
/* no use in searching str past point where search_str will fit */
px = (len1 - len2);
for (p = 0; p <= px; p++) for (p = 0; p <= px; p++)
{ {
if ((*p2 == *p1) && (strncmp(p1, p2, len2) == 0)) if ((*p2 == *p1) && (strncmp(p1, p2, len2) == 0))
@@ -799,6 +799,9 @@ text_position(Datum str, Datum search_str, int matchnum)
(void) pg_mb2wchar_with_len((unsigned char *) VARDATA(t2), p2, len2); (void) pg_mb2wchar_with_len((unsigned char *) VARDATA(t2), p2, len2);
len2 = pg_wchar_strlen(p2); len2 = pg_wchar_strlen(p2);
/* no use in searching str past point where search_str will fit */
px = (len1 - len2);
for (p = 0; p <= px; p++) for (p = 0; p <= px; p++)
{ {
if ((*p2 == *p1) && (pg_wchar_strncmp(p1, p2, len2) == 0)) if ((*p2 == *p1) && (pg_wchar_strncmp(p1, p2, len2) == 0))