diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:18:59 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:18:59 +0000 |
commit | e4cac77252307c3311d2d799e064fb27f921b3d3 (patch) | |
tree | 594e7dee1e7a150674627ce7f932fee6af05d74f /regex.c | |
parent | 1efa5d37a11b18f5822a8dc0222ca5de2ad7aa0c (diff) |
merge revision(s) 16143:
* regex.c (re_search): string might be NULL. [ruby-core:16478]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regex.c')
-rw-r--r-- | regex.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -3177,6 +3177,10 @@ re_search(bufp, string, size, startpos, range, regs) /* Check for out-of-range starting position. */ if (startpos < 0 || startpos > size) return -1; + if (!string) { + if (size == 0) string = ""; + else return -1; + } /* Update the fastmap now if not correct already. */ if (fastmap && !bufp->fastmap_accurate) { |