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

check string lengths to avoid index out of bound

Browse source
This commit is contained in:
koranza 2018-05-18 18:25:49 -05:00 • committed by GitHub
commit aefa6547c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/os.nim
View file

@ -139,6 +139,7 @@ proc findExe*(exe: string, followSymlinks: bool = true;
## is added the `ExeExts <#ExeExts>`_ file extensions if it has none. ## is added the `ExeExts <#ExeExts>`_ file extensions if it has none.
## If the system supports symlinks it also resolves them until it ## If the system supports symlinks it also resolves them until it
## meets the actual file. This behavior can be disabled if desired. ## meets the actual file. This behavior can be disabled if desired.
if exe.len == 0: return
template checkCurrentDir() = template checkCurrentDir() =
for ext in extensions: for ext in extensions:
result = addFileExt(exe, ext) result = addFileExt(exe, ext)
@ -149,8 +150,9 @@ proc findExe*(exe: string, followSymlinks: bool = true;
checkCurrentDir() checkCurrentDir()
let path = string(getEnv("PATH")) let path = string(getEnv("PATH"))
for candidate in split(path, PathSep): for candidate in split(path, PathSep):
if candidate.len == 0: continue
when defined(windows): when defined(windows):
var x = (if candidate[0] == '"' and candidate[^1] == '"': var x = (if candidate.len > 2 and candidate[0] == '"' and candidate[^1] == '"':
substr(candidate, 1, candidate.len-2) else: candidate) / substr(candidate, 1, candidate.len-2) else: candidate) /
exe exe
else: else:
@ -1649,4 +1651,4 @@ proc setLastModificationTime*(file: string, t: times.Time) =
var ft = t.toWinTime.toFILETIME var ft = t.toWinTime.toFILETIME
let res = setFileTime(h, nil, nil, ft.addr) let res = setFileTime(h, nil, nil, ft.addr)
discard h.closeHandle discard h.closeHandle
if res == 0'i32: raiseOSError(osLastError()) if res == 0'i32: raiseOSError(osLastError())