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

Use snprintf in create_thumbnail

Browse Source 
SVN revision: 2082
This commit is contained in:
Stefan Ritt 2008-03-27 05:58:12 +00:00
parent 176d953476
commit 6517a24374
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/elogd.c
View File

@ -22110,7 +22110,7 @@ int is_inline_attachment(char *encoding, int message_id, char *text, int i, char
int create_thumbnail(LOGBOOK * lbs, char *file_name) int create_thumbnail(LOGBOOK * lbs, char *file_name)
{ {
char str[MAX_PATH_LENGTH], cmd[2 * MAX_PATH_LENGTH], thumb_size[256]; char str[2 * MAX_PATH_LENGTH], cmd[2 * MAX_PATH_LENGTH], thumb_size[256];
int i; int i;
if (!image_magick_exist) if (!image_magick_exist)
@ -22141,9 +22141,9 @@ int create_thumbnail(LOGBOOK * lbs, char *file_name)
strlcat(str, ".png", sizeof(str)); strlcat(str, ".png", sizeof(str));
if (chkext(file_name, ".pdf") || chkext(file_name, ".ps")) if (chkext(file_name, ".pdf") || chkext(file_name, ".ps"))
sprintf(cmd, "convert '%s[0-7]'%s '%s'", file_name, thumb_size, str); snprintf(cmd, sizeof(cmd), "convert '%s[0-7]'%s '%s'", file_name, thumb_size, str);
else else
sprintf(cmd, "convert '%s'%s '%s'", file_name, thumb_size, str); snprintf(cmd, sizeof(cmd), "convert '%s'%s '%s'", file_name, thumb_size, str);
#ifdef OS_WINNT #ifdef OS_WINNT
for (i = 0; i < (int) strlen(cmd); i++) for (i = 0; i < (int) strlen(cmd); i++)
@ -22151,7 +22151,7 @@ int create_thumbnail(LOGBOOK * lbs, char *file_name)
cmd[i] = '\"'; cmd[i] = '\"';
#endif #endif
sprintf(str, "SHELL \"%s\"", cmd); snprintf(str, sizeof(str), "SHELL \"%s\"", cmd);
write_logfile(lbs, str); write_logfile(lbs, str);
if (verbose) { if (verbose) {
eprintf(str); eprintf(str);
@ -22176,11 +22176,12 @@ int get_thumb_name(const char *file_name, char *thumb_name, int size, int index)
thumb_name[0] = 0; thumb_name[0] = 0;
/* append .png for all files as thumbnail name, except for PDF files (convert bug!) */ /* append .png for all files as thumbnail name, except for PDF files (convert bug!) */
memset(str, 0, sizeof(str));
if (chkext(file_name, ".pdf") || chkext(file_name, ".ps")) { if (chkext(file_name, ".pdf") || chkext(file_name, ".ps")) {
strlcpy(str, file_name, sizeof(str)); strlcpy(str, file_name, sizeof(str));
if (strrchr(str, '.')) if (strrchr(str, '.'))
*strrchr(str, '.') = 0; *strrchr(str, '.') = 0;
sprintf(str + strlen(str), "-%d.png", index); snprintf(str + strlen(str), sizeof(str)-strlen(str)-1, "-%d.png", index);
if (file_exist(str)) { if (file_exist(str)) {
strlcpy(thumb_name, str, size); strlcpy(thumb_name, str, size);
return 2; return 2;