修复摄像头、科大讯飞、rcsp、彩屏仓等相关测试问题;
This commit is contained in:
@@ -144,9 +144,6 @@ extern "C" {
|
||||
#else
|
||||
/* For size_t */
|
||||
#include <stddef.h>
|
||||
extern void *mbedtls_calloc(size_t n, size_t size);
|
||||
extern void mbedtls_free(void *ptr);
|
||||
|
||||
/**
|
||||
* \brief This function dynamically sets the memory-management
|
||||
* functions used by the library, during runtime.
|
||||
@@ -161,8 +158,25 @@ int mbedtls_platform_set_calloc_free(void *(*calloc_func)(size_t, size_t),
|
||||
#endif /* MBEDTLS_PLATFORM_FREE_MACRO && MBEDTLS_PLATFORM_CALLOC_MACRO */
|
||||
#else /* !MBEDTLS_PLATFORM_MEMORY */
|
||||
|
||||
extern void *jl_mbedtls_calloc(unsigned long count, unsigned long size);
|
||||
extern void jl_mbedtls_free(void *pv);
|
||||
__attribute__((weak))
|
||||
void jl_mbedtls_free(void *pv)
|
||||
{
|
||||
if (pv != NULL) {
|
||||
free(pv);
|
||||
}
|
||||
}
|
||||
|
||||
__attribute__((weak))
|
||||
void *jl_mbedtls_calloc(unsigned long count, unsigned long size)
|
||||
{
|
||||
size_t total = count * size;
|
||||
void *p = malloc(total);
|
||||
if (p) {
|
||||
memset(p, 0, total);
|
||||
}
|
||||
return p;
|
||||
}
|
||||
|
||||
#define mbedtls_free jl_mbedtls_free
|
||||
#define mbedtls_calloc jl_mbedtls_calloc
|
||||
#endif /* MBEDTLS_PLATFORM_MEMORY && !MBEDTLS_PLATFORM_{FREE,CALLOC}_MACRO */
|
||||
|
||||
Reference in New Issue
Block a user