oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hx509: make hx509_get_error_string(NULL, ...) work

Browse Source 
If hx509_context_init() fails we should still be able to do something
with its return code.
This commit is contained in:
Nicolas Williams
2019-07-12 13:38:22 -05:00
parent eaebb892b8
commit f2776ce841
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/hx509/error.c
View File

@@ -133,10 +133,27 @@ hx509_set_error_string(hx509_context context, int flags, int code,
HX509_LIB_FUNCTION char * HX509_LIB_CALL HX509_LIB_FUNCTION char * HX509_LIB_CALL
hx509_get_error_string(hx509_context context, int error_code) hx509_get_error_string(hx509_context context, int error_code)
{ {
heim_error_t msg = context->error; heim_error_t msg;
heim_string_t s; heim_string_t s;
char *str = NULL; char *str = NULL;
if (context == NULL) {
const char *sys_err_msg;
/* This case should only happen on hx509_context_init() failure */
if ((sys_err_msg = strerror(error_code))) {
if (asprintf(&str, "hx509_context_init system error: %s (%d)",
sys_err_msg, error_code) == -1)
return NULL;
return str;
}
if (asprintf(&str, "hx509_context_init unknown error: %d",
error_code) == -1)
return NULL;
return str;
}
msg = context->error;
if (msg == NULL || heim_error_get_code(msg) != error_code) { if (msg == NULL || heim_error_get_code(msg) != error_code) {
const char *cstr; const char *cstr;