yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8404 from paul-elliott-arm/fix_coverity_issues

Browse source 
Fix two coverity issues
This commit is contained in:
Paul Elliott 2023-10-30 18:00:14 +00:00 committed by GitHub
commit 835edd627d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/suites/test_suite_mps.function
View file

@ -65,6 +65,8 @@ void mbedtls_mps_reader_no_pausing_single_step_single_round(int with_acc)
/* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, &paused) == 0);
TEST_ASSERT(paused == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -119,6 +121,8 @@ void mbedtls_mps_reader_no_pausing_single_step_multiple_rounds(int with_acc)
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -170,6 +174,8 @@ void mbedtls_mps_reader_no_pausing_multiple_steps_single_round(int with_acc)
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -217,6 +223,8 @@ void mbedtls_mps_reader_no_pausing_multiple_steps_multiple_rounds(int with_acc)
TEST_ASSERT(mbedtls_mps_reader_commit(&rd) == 0);
/* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -250,6 +258,8 @@ void mbedtls_mps_reader_pausing_needed_disabled()
/* Wrapup (lower layer) */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) ==
MBEDTLS_ERR_MPS_READER_NEED_ACCUMULATOR);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -297,6 +307,7 @@ void mbedtls_mps_reader_pausing_needed_buffer_too_small()
TEST_ASSERT(mbedtls_mps_reader_get(&rd, 50, &tmp, &tmp_len) == 0);
TEST_MEMORY_COMPARE(tmp, tmp_len, buf + 50, 50);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -333,6 +344,7 @@ void mbedtls_mps_reader_reclaim_overflow()
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) ==
MBEDTLS_ERR_MPS_READER_ACCUMULATOR_TOO_SMALL);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -458,6 +470,8 @@ void mbedtls_mps_reader_pausing(int option)
/* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -562,6 +576,8 @@ void mbedtls_mps_reader_pausing_multiple_feeds(int option)
/* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -623,6 +639,8 @@ void mbedtls_mps_reader_reclaim_data_left(int option)
/* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) ==
MBEDTLS_ERR_MPS_READER_DATA_LEFT);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -795,6 +813,7 @@ void mbedtls_mps_reader_multiple_pausing(int option)
break;
}
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */
@ -951,6 +970,7 @@ void mbedtls_mps_reader_random_usage(int num_out_chunks,
}
}
exit:
/* Cleanup */
mbedtls_mps_reader_free(&rd);
mbedtls_free(incoming);
@ -1103,6 +1123,7 @@ void mbedtls_reader_inconsistent_usage(int option)
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
}
exit:
/* Wrapup */
mbedtls_mps_reader_free(&rd);
}
@ -1136,6 +1157,8 @@ void mbedtls_mps_reader_feed_empty()
/* Wrapup */
TEST_ASSERT(mbedtls_mps_reader_reclaim(&rd, NULL) == 0);
exit:
mbedtls_mps_reader_free(&rd);
}
/* END_CASE */

7
tests/suites/test_suite_psa_crypto.function
View file

@ -7639,8 +7639,7 @@ void interruptible_signverify_hash_edgecase_tests(int key_type_arg,
* no reliance on external buffers. */
psa_interruptible_set_max_ops(PSA_INTERRUPTIBLE_MAX_OPS_UNLIMITED);
input_buffer = mbedtls_calloc(1, input_data->len);
TEST_ASSERT(input_buffer != NULL);
TEST_CALLOC(input_buffer, input_data->len);
memcpy(input_buffer, input_data->x, input_data->len);
@ -7657,8 +7656,7 @@ void interruptible_signverify_hash_edgecase_tests(int key_type_arg,
PSA_ASSERT(psa_sign_hash_abort(&sign_operation));
input_buffer = mbedtls_calloc(1, input_data->len);
TEST_ASSERT(input_buffer != NULL);
TEST_CALLOC(input_buffer, input_data->len);
memcpy(input_buffer, input_data->x, input_data->len);
@ -7683,6 +7681,7 @@ exit:
psa_destroy_key(key);
mbedtls_free(signature);
mbedtls_free(input_buffer);
PSA_DONE();
}
/* END_CASE */