diff options
| author | wtc%netscape.com <devnull@localhost> | 2000-05-26 01:39:33 +0000 |
|---|---|---|
| committer | wtc%netscape.com <devnull@localhost> | 2000-05-26 01:39:33 +0000 |
| commit | 083b47f3b1b8aaf27cf7f742c9a03ad32c9c053f (patch) | |
| tree | 118985267b3f8f80d9510a9c08a69ec1e50cbfcb | |
| parent | cb2a10cd241d287c63cfd77157b0ea053b6caf6d (diff) | |
| download | nspr-hg-083b47f3b1b8aaf27cf7f742c9a03ad32c9c053f.tar.gz | |
Bugzilla bug #39967: replace an assertion in _PR_MD_GETFILEINFO64 by
proper error checking and failure return. Thanks to Bernd Mielke
<mielke@licel.com> for the bug report.
Modified files: ntio.c, w95io.c
(NSPRPUB_RELEASE_4_0_BRANCH)
| -rw-r--r-- | pr/src/md/windows/ntio.c | 5 | ||||
| -rw-r--r-- | pr/src/md/windows/w95io.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pr/src/md/windows/ntio.c b/pr/src/md/windows/ntio.c index 20f0e695..7154de30 100644 --- a/pr/src/md/windows/ntio.c +++ b/pr/src/md/windows/ntio.c @@ -3016,7 +3016,10 @@ _PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info) } len = GetFullPathName(fn, sizeof(pathbuf), pathbuf, &filePart); - PR_ASSERT(0 != len); + if (0 == len) { + _PR_MD_MAP_OPENDIR_ERROR(GetLastError()); + return -1; + } if (len > sizeof(pathbuf)) { PR_SetError(PR_NAME_TOO_LONG_ERROR, 0); return -1; diff --git a/pr/src/md/windows/w95io.c b/pr/src/md/windows/w95io.c index d80736fe..3832eb4b 100644 --- a/pr/src/md/windows/w95io.c +++ b/pr/src/md/windows/w95io.c @@ -773,7 +773,10 @@ _PR_MD_GETFILEINFO64(const char *fn, PRFileInfo64 *info) } len = GetFullPathName(fn, sizeof(pathbuf), pathbuf, &filePart); - PR_ASSERT(0 != len); + if (0 == len) { + _PR_MD_MAP_OPENDIR_ERROR(GetLastError()); + return -1; + } if (len > sizeof(pathbuf)) { PR_SetError(PR_NAME_TOO_LONG_ERROR, 0); return -1; |