Merge pull request #9361 from douzzer/20251029-NullPointerArithm-fixes

dgarske · web-flow · commit d45678472de0 · 2025-10-29T09:12:40.000-07:00
20251029-NullPointerArithm-fixes
diff --git a/examples/pem/pem.c b/examples/pem/pem.c
@@ -977,7 +977,7 @@ int main(int argc, char* argv[])
             out_len = der->length;
         }
     }
-    else {
+    else if (ret == 0) {
 #ifdef WOLFSSL_DER_TO_PEM
     #if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_PWDBASED)
         if (enc_der) {
diff --git a/src/internal.c b/src/internal.c
@@ -10470,7 +10470,7 @@ int HashOutput(WOLFSSL* ssl, const byte* output, int sz, int ivSz)
 {
     const byte* adj;
 
-    if (ssl->hsHashes == NULL)
+    if ((ssl->hsHashes == NULL) || (output == NULL))
         return BAD_FUNC_ARG;
 
     adj = output + RECORD_HEADER_SZ + ivSz;

Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,7 @@ int main(int argc, char* argv[])`
`977`	`977`	`out_len = der->length;`
`978`	`978`	`}`
`979`	`979`	`}`
`980`		`- else {`
	`980`	`+ else if (ret == 0) {`
`981`	`981`	`#ifdef WOLFSSL_DER_TO_PEM`
`982`	`982`	`#if defined(WOLFSSL_ENCRYPTED_KEYS) && !defined(NO_PWDBASED)`
`983`	`983`	`if (enc_der) {`
Original file line number	Diff line number	Diff line change
`@@ -10470,7 +10470,7 @@ int HashOutput(WOLFSSL* ssl, const byte* output, int sz, int ivSz)`
`10470`	`10470`	`{`
`10471`	`10471`	`const byte* adj;`
`10472`	`10472`
`10473`		`- if (ssl->hsHashes == NULL)`
	`10473`	`+ if ((ssl->hsHashes == NULL) \|\| (output == NULL))`
`10474`	`10474`	`return BAD_FUNC_ARG;`
`10475`	`10475`
`10476`	`10476`	`adj = output + RECORD_HEADER_SZ + ivSz;`