forked from wolfSSL/wolfssl
Merge pull request #5187 from kareem-wolfssl/hsHashesNull
Confirm ssl->hsHashes is not NULL before attempting to dereference it.
This commit is contained in:
@@ -14369,7 +14369,7 @@ static int DoHandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
|
|||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
ssl->options.cacheMessages = 0;
|
ssl->options.cacheMessages = 0;
|
||||||
if (ssl->hsHashes->messages != NULL) {
|
if ((ssl->hsHashes != NULL) && (ssl->hsHashes->messages != NULL)) {
|
||||||
XFREE(ssl->hsHashes->messages, ssl->heap,
|
XFREE(ssl->hsHashes->messages, ssl->heap,
|
||||||
DYNAMIC_TYPE_HASHES);
|
DYNAMIC_TYPE_HASHES);
|
||||||
ssl->hsHashes->messages = NULL;
|
ssl->hsHashes->messages = NULL;
|
||||||
@@ -14455,7 +14455,7 @@ static int DoHandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
|
|||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
ssl->options.cacheMessages = 0;
|
ssl->options.cacheMessages = 0;
|
||||||
if (ssl->hsHashes->messages != NULL) {
|
if ((ssl->hsHashes != NULL) && (ssl->hsHashes->messages != NULL)) {
|
||||||
XFREE(ssl->hsHashes->messages, ssl->heap, DYNAMIC_TYPE_HASHES);
|
XFREE(ssl->hsHashes->messages, ssl->heap, DYNAMIC_TYPE_HASHES);
|
||||||
ssl->hsHashes->messages = NULL;
|
ssl->hsHashes->messages = NULL;
|
||||||
}
|
}
|
||||||
|
@@ -164,7 +164,7 @@ WOLFSSL_API int wolfSSL_ASN1_item_i2d(const void *src, byte **dest,
|
|||||||
const WOLFSSL_ASN1_ITEM *tpl);
|
const WOLFSSL_ASN1_ITEM *tpl);
|
||||||
|
|
||||||
/* Need function declaration otherwise compiler complains */
|
/* Need function declaration otherwise compiler complains */
|
||||||
// NOLINTBEGIN(readability-named-parameter)
|
/* // NOLINTBEGIN(readability-named-parameter) */
|
||||||
#define IMPLEMENT_ASN1_FUNCTIONS(type) \
|
#define IMPLEMENT_ASN1_FUNCTIONS(type) \
|
||||||
type *type##_new(void); \
|
type *type##_new(void); \
|
||||||
type *type##_new(void){ \
|
type *type##_new(void){ \
|
||||||
@@ -179,7 +179,7 @@ WOLFSSL_API int wolfSSL_ASN1_item_i2d(const void *src, byte **dest,
|
|||||||
{ \
|
{ \
|
||||||
return wolfSSL_ASN1_item_i2d(src, dest, &type##_template_data);\
|
return wolfSSL_ASN1_item_i2d(src, dest, &type##_template_data);\
|
||||||
}
|
}
|
||||||
// NOLINTEND(readability-named-parameter)
|
/* // NOLINTEND(readability-named-parameter) */
|
||||||
|
|
||||||
#endif /* OPENSSL_ALL */
|
#endif /* OPENSSL_ALL */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user