Mercurial > hg > orthanc

comparison OrthancFramework/Resources/Patches/civetweb-1.14.patch @ 5357:fddb5d8d0021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Prevent the leak of the full path of the source files in the binaries
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 06 Jul 2023 17:04:31 +0200
parents 68635d365a27
children
comparison
equal deleted inserted replaced
5354:65b4e6ae2703 5357:fddb5d8d0021
1 diff -urEb civetweb-1.14.orig/src/civetweb.c civetweb-1.14/src/civetweb.c 1 diff -urEb civetweb-1.14.orig/src/civetweb.c civetweb-1.14/src/civetweb.c
2 --- civetweb-1.14.orig/src/civetweb.c 2021-06-21 17:42:52.343136123 +0200 2 --- civetweb-1.14.orig/src/civetweb.c 2023-07-06 15:48:01.163703913 +0200
3 +++ civetweb-1.14/src/civetweb.c 2021-06-21 17:43:11.623158128 +0200 3 +++ civetweb-1.14/src/civetweb.c 2023-07-06 15:48:51.207843938 +0200
4 @@ -567,7 +567,7 @@
5 #if (_MSC_VER < 1300)
6 #define STRX(x) #x
7 #define STR(x) STRX(x)
8 -#define __func__ __FILE__ ":" STR(__LINE__)
9 +#define __func__ __ORTHANC_FILE__ ":" STR(__LINE__)
10 #define strtoull(x, y, z) ((unsigned __int64)_atoi64(x))
11 #define strtoll(x, y, z) (_atoi64(x))
12 #else
13 @@ -1450,14 +1450,14 @@
14 }
15
16
17 -#define mg_malloc(a) mg_malloc_ex(a, NULL, __FILE__, __LINE__)
18 -#define mg_calloc(a, b) mg_calloc_ex(a, b, NULL, __FILE__, __LINE__)
19 -#define mg_realloc(a, b) mg_realloc_ex(a, b, NULL, __FILE__, __LINE__)
20 -#define mg_free(a) mg_free_ex(a, __FILE__, __LINE__)
21 -
22 -#define mg_malloc_ctx(a, c) mg_malloc_ex(a, c, __FILE__, __LINE__)
23 -#define mg_calloc_ctx(a, b, c) mg_calloc_ex(a, b, c, __FILE__, __LINE__)
24 -#define mg_realloc_ctx(a, b, c) mg_realloc_ex(a, b, c, __FILE__, __LINE__)
25 +#define mg_malloc(a) mg_malloc_ex(a, NULL, __ORTHANC_FILE__, __LINE__)
26 +#define mg_calloc(a, b) mg_calloc_ex(a, b, NULL, __ORTHANC_FILE__, __LINE__)
27 +#define mg_realloc(a, b) mg_realloc_ex(a, b, NULL, __ORTHANC_FILE__, __LINE__)
28 +#define mg_free(a) mg_free_ex(a, __ORTHANC_FILE__, __LINE__)
29 +
30 +#define mg_malloc_ctx(a, c) mg_malloc_ex(a, c, __ORTHANC_FILE__, __LINE__)
31 +#define mg_calloc_ctx(a, b, c) mg_calloc_ex(a, b, c, __ORTHANC_FILE__, __LINE__)
32 +#define mg_realloc_ctx(a, b, c) mg_realloc_ex(a, b, c, __ORTHANC_FILE__, __LINE__)
33
34
35 #else /* USE_SERVER_STATS */
4 @@ -1774,6 +1774,7 @@ 36 @@ -1774,6 +1774,7 @@
5 #if !defined(OPENSSL_API_3_0) 37 #if !defined(OPENSSL_API_3_0)
6 #define OPENSSL_API_3_0 38 #define OPENSSL_API_3_0
7 #endif 39 #endif
8 +#define OPENSSL_REMOVE_THREAD_STATE() 40 +#define OPENSSL_REMOVE_THREAD_STATE()