jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix getinfo overflows

Browse source
This commit is contained in:
Flaviu Tamas 2015-04-11 11:15:51 -04:00
commit 4ce267c08d
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nre.nim
View file

@ -189,17 +189,17 @@ proc getinfo[T](pattern: Regex, opt: cint): T =
# Regex accessors {{{ # Regex accessors {{{
proc captureCount*(pattern: Regex): int = proc captureCount*(pattern: Regex): int =
return getinfo[int](pattern, pcre.INFO_CAPTURECOUNT) return getinfo[cint](pattern, pcre.INFO_CAPTURECOUNT)
proc captureNameId*(pattern: Regex): Table[string, int] = proc captureNameId*(pattern: Regex): Table[string, int] =
return pattern.captureNameToId return pattern.captureNameToId
proc matchesCrLf(pattern: Regex): bool = proc matchesCrLf(pattern: Regex): bool =
let flags = getinfo[cint](pattern, pcre.INFO_OPTIONS) let flags = uint32(getinfo[culong](pattern, pcre.INFO_OPTIONS))
let newlineFlags = flags and (pcre.NEWLINE_CRLF or let newlineFlags = flags and (pcre.NEWLINE_CRLF or
pcre.NEWLINE_ANY or pcre.NEWLINE_ANY or
pcre.NEWLINE_ANYCRLF) pcre.NEWLINE_ANYCRLF)
if newLineFlags > 0: if newLineFlags > 0u32:
return true return true
# get flags from build config # get flags from build config
@ -464,7 +464,8 @@ iterator findIter*(str: string, pattern: Regex, start = 0, endpos = int.high): R
## - ``proc findAll(...)`` returns a ``seq[string]`` ## - ``proc findAll(...)`` returns a ``seq[string]``
# see pcredemo for explaination # see pcredemo for explaination
let matchesCrLf = pattern.matchesCrLf() let matchesCrLf = pattern.matchesCrLf()
let unicode = (getinfo[cint](pattern, pcre.INFO_OPTIONS) and pcre.UTF8) > 0 let unicode = uint32(getinfo[culong](pattern, pcre.INFO_OPTIONS) and
pcre.UTF8) > 0u32
let strlen = if endpos == int.high: str.len else: endpos+1 let strlen = if endpos == int.high: str.len else: endpos+1
var offset = start var offset = start