lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-06-05 00:22:11 +03:00
Code

Fix use of uninitialised variable

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-03-31 17:07:04 +01:00
parent b2e3c7af2d
commit 8f109fc249
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/timing.c
View File

@ -233,9 +233,7 @@ volatile int mbedtls_timing_alarmed = 0;
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset) unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
{ {
/* We can't safely cast val because it may not be aligned, so use memcpy */
struct _hr_time t; struct _hr_time t;
memcpy(&t, val, sizeof(struct _hr_time));
if (reset) { if (reset) {
QueryPerformanceCounter(&t.start); QueryPerformanceCounter(&t.start);
@ -244,6 +242,8 @@ unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int r
} else { } else {
unsigned long delta; unsigned long delta;
LARGE_INTEGER now, hfreq; LARGE_INTEGER now, hfreq;
/* We can't safely cast val because it may not be aligned, so use memcpy */
memcpy(&t, val, sizeof(struct _hr_time));
QueryPerformanceCounter(&now); QueryPerformanceCounter(&now);
QueryPerformanceFrequency(&hfreq); QueryPerformanceFrequency(&hfreq);
delta = (unsigned long) ((now.QuadPart - t.start.QuadPart) * 1000ul delta = (unsigned long) ((now.QuadPart - t.start.QuadPart) * 1000ul
@ -282,9 +282,7 @@ void mbedtls_set_alarm(int seconds)
unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset) unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int reset)
{ {
/* We can't safely cast val because it may not be aligned, so use memcpy */
struct _hr_time t; struct _hr_time t;
memcpy(&t, val, sizeof(struct _hr_time));
if (reset) { if (reset) {
gettimeofday(&t.start, NULL); gettimeofday(&t.start, NULL);
@ -293,6 +291,8 @@ unsigned long mbedtls_timing_get_timer(struct mbedtls_timing_hr_time *val, int r
} else { } else {
unsigned long delta; unsigned long delta;
struct timeval now; struct timeval now;
/* We can't safely cast val because it may not be aligned, so use memcpy */
memcpy(&t, val, sizeof(struct _hr_time));
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
delta = (now.tv_sec - t.start.tv_sec) * 1000ul delta = (now.tv_sec - t.start.tv_sec) * 1000ul
+ (now.tv_usec - t.start.tv_usec) / 1000; + (now.tv_usec - t.start.tv_usec) / 1000;