summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-07-07 19:49:14 +0000
committerWayne Davison <wayned@samba.org>2005-07-07 19:49:14 +0000
commita1f99493b39610e2ea9deb4bb1c71ba63bce5834 (patch)
treed10aa03b4b1d6ad3958bd95f5e617526fb255be5
parent9819f005b667f938f6853636492665cac761c54f (diff)
downloadrsync-a1f99493b39610e2ea9deb4bb1c71ba63bce5834.tar.gz
Changed overflow() to overflow_exit().
-rw-r--r--exclude.c2
-rw-r--r--flist.c8
-rw-r--r--util.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/exclude.c b/exclude.c
index 36faa966..59b4ef52 100644
--- a/exclude.c
+++ b/exclude.c
@@ -1176,7 +1176,7 @@ void recv_filter_list(int f_in)
if (!local_server && (am_sender || receiver_wants_list)) {
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
- overflow("recv_rules");
+ overflow_exit("recv_rules");
read_sbuf(f_in, line, len);
parse_rule(&filter_list, line, 0, xflags);
}
diff --git a/flist.c b/flist.c
index 64ff0077..476e7508 100644
--- a/flist.c
+++ b/flist.c
@@ -546,7 +546,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
rprintf(FERROR,
"overflow: flags=0x%x l1=%d l2=%d lastname=%s\n",
flags, l1, l2, safe_fname(lastname));
- overflow("receive_file_entry");
+ overflow_exit("receive_file_entry");
}
strlcpy(thisname, lastname, l1 + 1);
@@ -611,7 +611,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist,
if (linkname_len <= 0 || linkname_len > MAXPATHLEN) {
rprintf(FERROR, "overflow: linkname_len=%d\n",
linkname_len - 1);
- overflow("receive_file_entry");
+ overflow_exit("receive_file_entry");
}
}
else
@@ -1122,7 +1122,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
fname[1] = '\0';
} else {
if (l + 1 >= MAXPATHLEN)
- overflow("send_file_list");
+ overflow_exit("send_file_list");
fname[l++] = '.';
fname[l] = '\0';
}
@@ -1130,7 +1130,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
} else if (l > 1 && fname[l-1] == '.' && fname[l-2] == '.'
&& (l == 2 || fname[l-3] == '/')) {
if (l + 2 >= MAXPATHLEN)
- overflow("send_file_list");
+ overflow_exit("send_file_list");
fname[l++] = '/';
fname[l++] = '.';
fname[l] = '\0';
diff --git a/util.c b/util.c
index 6cbe7e1c..234a61e8 100644
--- a/util.c
+++ b/util.c
@@ -120,7 +120,7 @@ void out_of_memory(char *str)
exit_cleanup(RERR_MALLOC);
}
-void overflow(char *str)
+void overflow_exit(char *str)
{
rprintf(FERROR, "ERROR: buffer overflow in %s\n", str);
exit_cleanup(RERR_MALLOC);