diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2013-07-31 11:31:22 -0400 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2013-07-31 11:31:22 -0400 |
commit | d074b4e50d11768ab6da696b13d40ec05e4823fb (patch) | |
tree | 8ef9058772588c50ac10cc49201c0ea02bbf6d30 /src/backend/utils/adt/varlena.c | |
parent | c876fb42417739dbb19540ef61f6cd75752eb16e (diff) | |
download | postgresql-d074b4e50d11768ab6da696b13d40ec05e4823fb.tar.gz postgresql-d074b4e50d11768ab6da696b13d40ec05e4823fb.zip |
Fix regexp_matches() handling of zero-length matches.
We'd find the same match twice if it was of zero length and not immediately
adjacent to the previous match. replace_text_regexp() got similar cases
right, so adjust this search logic to match that. Note that even though
the regexp_split_to_xxx() functions share this code, they did not display
equivalent misbehavior, because the second match would be considered
degenerate and ignored.
Jeevan Chalke, with some cosmetic changes by me.
Diffstat (limited to 'src/backend/utils/adt/varlena.c')
-rw-r--r-- | src/backend/utils/adt/varlena.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 4aa344896f9..5e2c2ddc532 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -3083,7 +3083,10 @@ replace_text_regexp(text *src_text, void *regexp, break; /* - * Search from next character when the matching text is zero width. + * Advance search position. Normally we start the next search at the + * end of the previous match; but if the match was of zero length, we + * have to advance by one character, or we'd just find the same match + * again. */ search_start = data_pos; if (pmatch[0].rm_so == pmatch[0].rm_eo) |