Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed yet another array boundary violation

Browse Source 
SVN revision: 1849
This commit is contained in:
Stefan Ritt 2007-04-16 13:40:34 +00:00
parent deb8a22c72
commit 17a184ab11
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/elogd.c
View File

@ -5433,7 +5433,7 @@ void insert_breaks(char *str, int n, int size)
void rsputs(const char *str) void rsputs(const char *str)
{ {
if (strlen_retbuf + (int) strlen(str) > return_buffer_size) { if (strlen_retbuf + (int) strlen(str) + 1 >= return_buffer_size) {
return_buffer = xrealloc(return_buffer, return_buffer_size + 100000); return_buffer = xrealloc(return_buffer, return_buffer_size + 100000);
memset(return_buffer + return_buffer_size, 0, 100000); memset(return_buffer + return_buffer_size, 0, 100000);
return_buffer_size += 100000; return_buffer_size += 100000;
@ -12885,7 +12885,7 @@ int show_download_page(LOGBOOK * lbs, char *path)
show_plain_header(size, "export.txt"); show_plain_header(size, "export.txt");
/* increase return buffer size if file too big */ /* increase return buffer size if file too big */
if (size > return_buffer_size - (int) strlen(return_buffer)) { if (size + 1 >= return_buffer_size - (int) strlen(return_buffer)) {
delta = size - (return_buffer_size - strlen(return_buffer)) + 1000; delta = size - (return_buffer_size - strlen(return_buffer)) + 1000;
return_buffer = xrealloc(return_buffer, return_buffer_size + delta); return_buffer = xrealloc(return_buffer, return_buffer_size + delta);
@ -12921,7 +12921,7 @@ int download_config()
show_plain_header(size, "export.txt"); show_plain_header(size, "export.txt");
/* increase return buffer size if file too big */ /* increase return buffer size if file too big */
if (size > return_buffer_size - (int) strlen(return_buffer)) { if (size + 1 >= return_buffer_size - (int) strlen(return_buffer)) {
delta = size - (return_buffer_size - strlen(return_buffer)) + 1000; delta = size - (return_buffer_size - strlen(return_buffer)) + 1000;
return_buffer = xrealloc(return_buffer, return_buffer_size + delta); return_buffer = xrealloc(return_buffer, return_buffer_size + delta);
@ -20332,14 +20332,14 @@ void submit_elog(LOGBOOK * lbs)
continue; continue;
sprintf(str, "\"%s\" <%s>,", full_name, user_email); sprintf(str, "\"%s\" <%s>,", full_name, user_email);
if ((int) strlen(mail_to) + (int) strlen(str) >= mail_to_size) { if ((int) strlen(mail_to) + (int) strlen(str) + 1 >= mail_to_size) {
mail_to_size += 256; mail_to_size += 256;
mail_to = xrealloc(mail_to, mail_to_size); mail_to = xrealloc(mail_to, mail_to_size);
} }
strcat(mail_to, str); strcat(mail_to, str);
sprintf(str, "%s,", user_email); sprintf(str, "%s,", user_email);
if ((int) strlen(rcpt_to) + (int) strlen(str) >= rcpt_to_size) { if ((int) strlen(rcpt_to) + (int) strlen(str) + 1 >= rcpt_to_size) {
rcpt_to_size += 256; rcpt_to_size += 256;
rcpt_to = xrealloc(rcpt_to, rcpt_to_size); rcpt_to = xrealloc(rcpt_to, rcpt_to_size);
} }