projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix reading beyond string in yaz_sort_spec
[yaz-moved-to-github.git]
/
src
/
tpath.c
diff --git
a/src/tpath.c
b/src/tpath.c
index
900552e
..
deaf6f4
100644
(file)
--- a/
src/tpath.c
+++ b/
src/tpath.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2011 Index Data
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-76,6
+76,8
@@
char *yaz_filepath_resolve(const char *fname, const char *path,
{
if (path && *path == '\0')
path = 0;
{
if (path && *path == '\0')
path = 0;
+ if (strchr("/\\", *fname))
+ path = 0;
for (;;)
{
struct stat stat_buf;
for (;;)
{
struct stat stat_buf;
@@
-129,7
+131,8
@@
int yaz_is_abspath(const char *p)
#ifdef WIN32
if (*p == '\\')
return 1;
#ifdef WIN32
if (*p == '\\')
return 1;
- if (*p && p[1] == ':' && isalpha(*p))
+ if (*p && p[1] == ':' &&
+ ((*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z')))
return 1;
#endif
return 0;
return 1;
#endif
return 0;