diff options
| author | Nikola Pajkovsky <npajkovs@redhat.com> | 2011-02-01 12:22:07 +0100 |
|---|---|---|
| committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2011-02-01 12:22:07 +0100 |
| commit | 7cad610805bac55eb6c82f6377aaf35a5fe7d44b (patch) | |
| tree | 27a485f1042604157bdfdad0fc19f6e66431d116 | |
| parent | 42a4cff4b2cf2c40ff7a772313fcc0cc48c806fe (diff) | |
| parent | 63a7bca1faf63c4abc075a2fc293dd58f0760a62 (diff) | |
| download | abrt-7cad610805bac55eb6c82f6377aaf35a5fe7d44b.tar.gz abrt-7cad610805bac55eb6c82f6377aaf35a5fe7d44b.tar.xz abrt-7cad610805bac55eb6c82f6377aaf35a5fe7d44b.zip | |
Merge branch 'fix-for-abrt' of ssh://fedorapeople.org/home/fedora/npajkovs/public_git/abrt
* 'fix-for-abrt' of ssh://fedorapeople.org/home/fedora/npajkovs/public_git/abrt:
rhtsupport reads from uninitialized variable
load_plugin_settings.c: remove unused variable
| -rw-r--r-- | src/lib/load_plugin_settings.c | 2 | ||||
| -rw-r--r-- | src/plugins/abrt-action-rhtsupport.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/lib/load_plugin_settings.c b/src/lib/load_plugin_settings.c index 0f389069..1e6b31e7 100644 --- a/src/lib/load_plugin_settings.c +++ b/src/lib/load_plugin_settings.c @@ -35,7 +35,6 @@ bool load_conf_file(const char *pPath, map_string_h *settings, bool skipKeysWith while ((line = xmalloc_fgetline(fp)) != NULL) { unsigned ii; - bool is_value = false; bool valid = false; bool in_quote = false; /* We are reusing line buffer to form temporary @@ -61,7 +60,6 @@ bool load_conf_file(const char *pPath, map_string_h *settings, bool skipKeysWith } if (line[ii] == '=' && !in_quote) { - is_value = true; valid = true; *cur++ = '\0'; /* terminate key */ value = cur; /* remember where value starts */ diff --git a/src/plugins/abrt-action-rhtsupport.c b/src/plugins/abrt-action-rhtsupport.c index 337adae1..d6d677ac 100644 --- a/src/plugins/abrt-action-rhtsupport.c +++ b/src/plugins/abrt-action-rhtsupport.c @@ -66,8 +66,12 @@ static void report_to_rhtsupport( if (!login[0] || !password[0]) { - errmsg = _("Empty login or password, please check RHTSupport.conf"); - goto ret; + free_crash_data(crash_data); + free(url); + free(login); + free(password); + error_msg_and_die(_("Empty login or password, please check RHTSupport.conf")); + return; } package = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE); |