mirror of
https://github.com/openssl/openssl.git
synced 2024-11-27 05:21:51 +08:00
5a9dbfc58a
An attempt to clear an error with malloced data didn't clear the flags. Now it clears all flags except the malloced flag. Fixes #12530 Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/15667)
95 lines
2.9 KiB
C
95 lines
2.9 KiB
C
/*
|
|
* Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#include <openssl/err.h>
|
|
#include <openssl/e_os2.h>
|
|
|
|
static ossl_inline void err_get_slot(ERR_STATE *es)
|
|
{
|
|
es->top = (es->top + 1) % ERR_NUM_ERRORS;
|
|
if (es->top == es->bottom)
|
|
es->bottom = (es->bottom + 1) % ERR_NUM_ERRORS;
|
|
}
|
|
|
|
static ossl_inline void err_clear_data(ERR_STATE *es, size_t i, int deall)
|
|
{
|
|
if (es->err_data_flags[i] & ERR_TXT_MALLOCED) {
|
|
if (deall) {
|
|
OPENSSL_free(es->err_data[i]);
|
|
es->err_data[i] = NULL;
|
|
es->err_data_size[i] = 0;
|
|
es->err_data_flags[i] = 0;
|
|
} else if (es->err_data[i] != NULL) {
|
|
es->err_data[i][0] = '\0';
|
|
es->err_data_flags[i] = ERR_TXT_MALLOCED;
|
|
}
|
|
} else {
|
|
es->err_data[i] = NULL;
|
|
es->err_data_size[i] = 0;
|
|
es->err_data_flags[i] = 0;
|
|
}
|
|
}
|
|
|
|
static ossl_inline void err_set_error(ERR_STATE *es, size_t i,
|
|
int lib, int reason)
|
|
{
|
|
es->err_buffer[i] =
|
|
lib == ERR_LIB_SYS
|
|
? (unsigned int)(ERR_SYSTEM_FLAG | reason)
|
|
: ERR_PACK(lib, 0, reason);
|
|
}
|
|
|
|
static ossl_inline void err_set_debug(ERR_STATE *es, size_t i,
|
|
const char *file, int line,
|
|
const char *fn)
|
|
{
|
|
/*
|
|
* We dup the file and fn strings because they may be provider owned. If the
|
|
* provider gets unloaded, they may not be valid anymore.
|
|
*/
|
|
OPENSSL_free(es->err_file[i]);
|
|
if (file == NULL || file[0] == '\0')
|
|
es->err_file[i] = NULL;
|
|
else
|
|
es->err_file[i] = OPENSSL_strdup(file);
|
|
es->err_line[i] = line;
|
|
OPENSSL_free(es->err_func[i]);
|
|
if (fn == NULL || fn[0] == '\0')
|
|
es->err_func[i] = NULL;
|
|
else
|
|
es->err_func[i] = OPENSSL_strdup(fn);
|
|
}
|
|
|
|
static ossl_inline void err_set_data(ERR_STATE *es, size_t i,
|
|
void *data, size_t datasz, int flags)
|
|
{
|
|
if ((es->err_data_flags[i] & ERR_TXT_MALLOCED) != 0)
|
|
OPENSSL_free(es->err_data[i]);
|
|
es->err_data[i] = data;
|
|
es->err_data_size[i] = datasz;
|
|
es->err_data_flags[i] = flags;
|
|
}
|
|
|
|
static ossl_inline void err_clear(ERR_STATE *es, size_t i, int deall)
|
|
{
|
|
err_clear_data(es, i, (deall));
|
|
es->err_marks[i] = 0;
|
|
es->err_flags[i] = 0;
|
|
es->err_buffer[i] = 0;
|
|
es->err_line[i] = -1;
|
|
OPENSSL_free(es->err_file[i]);
|
|
es->err_file[i] = NULL;
|
|
OPENSSL_free(es->err_func[i]);
|
|
es->err_func[i] = NULL;
|
|
}
|
|
|
|
ERR_STATE *ossl_err_get_state_int(void);
|
|
void ossl_err_string_int(unsigned long e, const char *func,
|
|
char *buf, size_t len);
|