42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 8dc7206187ef9e9486fb5f102b85400ae9795dd1 Mon Sep 17 00:00:00 2001
|
|
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
|
|
Date: Mon, 19 Feb 2018 16:35:05 +0000
|
|
Subject: [PATCH] Fix POSIX API bug when REG_STARTEND is used with a non-zero
|
|
starting offset and there are unset groups within the matching group list.
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1724 2f5784b3-3f2a-0410-8824-cb99058d5e15
|
|
Petr Písař: Ported to 8.41.
|
|
---
|
|
pcreposix.c | 6 +++---
|
|
|
|
diff --git a/pcreposix.c b/pcreposix.c
|
|
index 7b404a7..a76d6bf 100644
|
|
--- a/pcreposix.c
|
|
+++ b/pcreposix.c
|
|
@@ -6,7 +6,7 @@
|
|
and semantics are as close as possible to those of the Perl 5 language.
|
|
|
|
Written by Philip Hazel
|
|
- Copyright (c) 1997-2017 University of Cambridge
|
|
+ Copyright (c) 1997-2018 University of Cambridge
|
|
|
|
-----------------------------------------------------------------------------
|
|
Redistribution and use in source and binary forms, with or without
|
|
@@ -389,8 +389,8 @@ if (rc >= 0)
|
|
{
|
|
for (i = 0; i < (size_t)rc; i++)
|
|
{
|
|
- pmatch[i].rm_so = ovector[i*2] + so;
|
|
- pmatch[i].rm_eo = ovector[i*2+1] + so;
|
|
+ pmatch[i].rm_so = (ovector[i*2] < 0)? -1 : ovector[i*2] + so;
|
|
+ pmatch[i].rm_eo = (ovector[i*2+1] < 0)? -1: ovector[i*2+1] + so;
|
|
}
|
|
if (allocated_ovector) free(ovector);
|
|
for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;
|
|
--
|
|
2.13.6
|
|
|