plug memory leaks in _alpm_key_import
Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
5d21b2d44c
commit
5151de3011
1 changed files with 4 additions and 1 deletions
|
@ -505,7 +505,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
|
||||||
}
|
}
|
||||||
|
|
||||||
STRDUP(fetch_key.uid, uid, return -1);
|
STRDUP(fetch_key.uid, uid, return -1);
|
||||||
STRDUP(fetch_key.fingerprint, fpr, return -1);
|
STRDUP(fetch_key.fingerprint, fpr, free(fetch_key.uid); return -1);
|
||||||
|
|
||||||
alpm_question_import_key_t question = {
|
alpm_question_import_key_t question = {
|
||||||
.type = ALPM_QUESTION_IMPORT_KEY,
|
.type = ALPM_QUESTION_IMPORT_KEY,
|
||||||
|
@ -517,6 +517,7 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
|
||||||
/* Try to import the key from a WKD first */
|
/* Try to import the key from a WKD first */
|
||||||
if(email_from_uid(uid, &email) == 0) {
|
if(email_from_uid(uid, &email) == 0) {
|
||||||
ret = key_import_wkd(handle, email);
|
ret = key_import_wkd(handle, email);
|
||||||
|
free(email);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If importing from the WKD fails, fall back to keyserver lookup */
|
/* If importing from the WKD fails, fall back to keyserver lookup */
|
||||||
|
@ -537,6 +538,8 @@ int _alpm_key_import(alpm_handle_t *handle, const char *uid, const char *fpr)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gpgme_key_unref(fetch_key.data);
|
gpgme_key_unref(fetch_key.data);
|
||||||
|
free(fetch_key.uid);
|
||||||
|
free(fetch_key.fingerprint);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue