[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
Alexandre Julliard
julliard at winehq.org
Sun Jun 17 20:03:19 UTC 2012
The following commit has been merged in the wheezy branch:
commit d3852aa5563c6b334efea6734e865fb7918a277c
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Apr 18 13:50:08 2012 +0200
jscript: Pass correct cpbegin to InitMatch.
(cherry picked from commit e21588aef7a12c04e817735d2f298c9a5a357c73)
diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c
index baef45b..e376ffe 100644
--- a/dlls/jscript/regexp.c
+++ b/dlls/jscript/regexp.c
@@ -3322,7 +3322,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D
REGlobalData gData;
DWORD matchlen;
- gData.cpbegin = *cp;
+ gData.cpbegin = str;
gData.cpend = str + len;
gData.start = *cp-str;
gData.skipped = 0;
@@ -3384,7 +3384,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D
(*parens)[i].str = NULL;
(*parens)[i].len = 0;
}else {
- (*parens)[i].str = *cp + result->parens[i].index;
+ (*parens)[i].str = str + result->parens[i].index;
(*parens)[i].len = result->parens[i].length;
}
}
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list