mirror of
https://github.com/curl/curl.git
synced 2024-12-09 06:30:06 +08:00
bc8509a748
GCC 14 introduces a new -Walloc-size included in -Wextra which gives:
```
src/tool_operate.c: In function ‘add_per_transfer’:
src/tool_operate.c:213:5: warning: allocation of insufficient size ‘1’ for type ‘struct per_transfer’ with size ‘480’ [-Walloc-size]
213 | p = calloc(sizeof(struct per_transfer), 1);
| ^
src/var.c: In function ‘addvariable’:
src/var.c:361:5: warning: allocation of insufficient size ‘1’ for type ‘struct var’ with size ‘32’ [-Walloc-size]
361 | p = calloc(sizeof(struct var), 1);
| ^
```
The calloc prototype is:
```
void *calloc(size_t nmemb, size_t size);
```
So, just swap the number of members and size arguments to match the
prototype, as we're initialising 1 struct of size `sizeof(struct
...)`. GCC then sees we're not doing anything wrong.
Closes #12292
135 lines
4.2 KiB
C
135 lines
4.2 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
* Copyright (C) Hoi-Ho Chan, <hoiho.chan@gmail.com>
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
* SPDX-License-Identifier: curl
|
|
*
|
|
***************************************************************************/
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(USE_MBEDTLS) && \
|
|
((defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)) || \
|
|
defined(USE_THREADS_WIN32))
|
|
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
# include <pthread.h>
|
|
# define MBEDTLS_MUTEX_T pthread_mutex_t
|
|
#elif defined(USE_THREADS_WIN32)
|
|
# define MBEDTLS_MUTEX_T HANDLE
|
|
#endif
|
|
|
|
#include "mbedtls_threadlock.h"
|
|
#include "curl_printf.h"
|
|
#include "curl_memory.h"
|
|
/* The last #include file should be: */
|
|
#include "memdebug.h"
|
|
|
|
/* number of thread locks */
|
|
#define NUMT 2
|
|
|
|
/* This array will store all of the mutexes available to Mbedtls. */
|
|
static MBEDTLS_MUTEX_T *mutex_buf = NULL;
|
|
|
|
int Curl_mbedtlsthreadlock_thread_setup(void)
|
|
{
|
|
int i;
|
|
|
|
mutex_buf = calloc(1, NUMT * sizeof(MBEDTLS_MUTEX_T));
|
|
if(!mutex_buf)
|
|
return 0; /* error, no number of threads defined */
|
|
|
|
for(i = 0; i < NUMT; i++) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_init(&mutex_buf[i], NULL))
|
|
return 0; /* pthread_mutex_init failed */
|
|
#elif defined(USE_THREADS_WIN32)
|
|
mutex_buf[i] = CreateMutex(0, FALSE, 0);
|
|
if(mutex_buf[i] == 0)
|
|
return 0; /* CreateMutex failed */
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
|
|
return 1; /* OK */
|
|
}
|
|
|
|
int Curl_mbedtlsthreadlock_thread_cleanup(void)
|
|
{
|
|
int i;
|
|
|
|
if(!mutex_buf)
|
|
return 0; /* error, no threads locks defined */
|
|
|
|
for(i = 0; i < NUMT; i++) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_destroy(&mutex_buf[i]))
|
|
return 0; /* pthread_mutex_destroy failed */
|
|
#elif defined(USE_THREADS_WIN32)
|
|
if(!CloseHandle(mutex_buf[i]))
|
|
return 0; /* CloseHandle failed */
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
free(mutex_buf);
|
|
mutex_buf = NULL;
|
|
|
|
return 1; /* OK */
|
|
}
|
|
|
|
int Curl_mbedtlsthreadlock_lock_function(int n)
|
|
{
|
|
if(n < NUMT) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_lock(&mutex_buf[n])) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_lock_function failed\n"));
|
|
return 0; /* pthread_mutex_lock failed */
|
|
}
|
|
#elif defined(USE_THREADS_WIN32)
|
|
if(WaitForSingleObject(mutex_buf[n], INFINITE) == WAIT_FAILED) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_lock_function failed\n"));
|
|
return 0; /* pthread_mutex_lock failed */
|
|
}
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
return 1; /* OK */
|
|
}
|
|
|
|
int Curl_mbedtlsthreadlock_unlock_function(int n)
|
|
{
|
|
if(n < NUMT) {
|
|
#if defined(USE_THREADS_POSIX) && defined(HAVE_PTHREAD_H)
|
|
if(pthread_mutex_unlock(&mutex_buf[n])) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_unlock_function failed\n"));
|
|
return 0; /* pthread_mutex_unlock failed */
|
|
}
|
|
#elif defined(USE_THREADS_WIN32)
|
|
if(!ReleaseMutex(mutex_buf[n])) {
|
|
DEBUGF(fprintf(stderr,
|
|
"Error: mbedtlsthreadlock_unlock_function failed\n"));
|
|
return 0; /* pthread_mutex_lock failed */
|
|
}
|
|
#endif /* USE_THREADS_POSIX && HAVE_PTHREAD_H */
|
|
}
|
|
return 1; /* OK */
|
|
}
|
|
|
|
#endif /* USE_MBEDTLS */
|