projects
/
claws.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e0a319b
)
Warn and fail rather than miserably crashing when format string in
author
wwp
<subscript@free.fr>
Sat, 18 Aug 2018 07:56:41 +0000
(09:56 +0200)
committer
wwp
<subscript@free.fr>
Sat, 18 Aug 2018 07:56:41 +0000
(09:56 +0200)
faulty.
src/account.c
patch
|
blob
|
history
diff --git
a/src/account.c
b/src/account.c
index cf2898385376c34f7c78f04b476e03d691d38887..e73a0127a1b4e999415351da9067843e9ddf737e 100644
(file)
--- a/
src/account.c
+++ b/
src/account.c
@@
-1977,8
+1977,14
@@
gboolean account_signatures_matchlist_str_found(const gchar *str, const gchar *f
item != NULL && !found;
item = g_slist_next(item)) {
tmp = g_strdup_printf(format, (gchar *)item->data);
item != NULL && !found;
item = g_slist_next(item)) {
tmp = g_strdup_printf(format, (gchar *)item->data);
- found = (strcmp(tmp, str) == 0);
- g_free(tmp);
+ if (tmp) {
+ found = (strcmp(tmp, str) == 0);
+ g_free(tmp);
+ } else {
+ g_warning("account_signatures_matchlist_str_found: g_strdup_printf failed, check format '%s'",
+ format);
+ return FALSE;
+ }
}
return found;
}
}
return found;
}
@@
-1995,9
+2001,15
@@
gboolean account_signatures_matchlist_nchar_found(const gchar *str, const gchar
item != NULL && !found;
item = g_slist_next(item)) {
tmp = g_strdup_printf(format, (gchar *)item->data);
item != NULL && !found;
item = g_slist_next(item)) {
tmp = g_strdup_printf(format, (gchar *)item->data);
- len = strlen(tmp);
- found = (strncmp(tmp, str, len) == 0);
- g_free(tmp);
+ if (tmp) {
+ len = strlen(tmp);
+ found = (strncmp(tmp, str, len) == 0);
+ g_free(tmp);
+ } else {
+ g_warning("account_signatures_matchlist_nchar_found: g_strdup_printf failed, check format '%s'",
+ format);
+ return FALSE;
+ }
}
return found;
}
}
return found;
}