Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A bug-fix for die_on_unsafe_path() when the path doesn't exist.
[rsync/rsync.git]
/
util.c
diff --git
a/util.c
b/util.c
index
afe1f88
..
afff767
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-111,13
+111,13
@@
void print_child_argv(char **cmd)
void out_of_memory(char *str)
{
void out_of_memory(char *str)
{
- rprintf(FERROR, "ERROR: out of memory in %s
\n", str
);
+ rprintf(FERROR, "ERROR: out of memory in %s
[%s]\n", str, who_am_i()
);
exit_cleanup(RERR_MALLOC);
}
void overflow_exit(char *str)
{
exit_cleanup(RERR_MALLOC);
}
void overflow_exit(char *str)
{
- rprintf(FERROR, "ERROR: buffer overflow in %s
\n", str
);
+ rprintf(FERROR, "ERROR: buffer overflow in %s
[%s]\n", str, who_am_i()
);
exit_cleanup(RERR_MALLOC);
}
exit_cleanup(RERR_MALLOC);
}
@@
-922,7
+922,8
@@
void die_on_unsafe_path(char *path, int strip_filename)
if ((p = strchr(p, '/')) != NULL)
*p = '\0';
if (safe_stat(path, &st) < 0) {
if ((p = strchr(p, '/')) != NULL)
*p = '\0';
if (safe_stat(path, &st) < 0) {
- *p++ = '/';
+ if (p)
+ *p = '/';
goto done;
}
if (S_ISLNK(st.st_mode)) {
goto done;
}
if (S_ISLNK(st.st_mode)) {