소스 검색

Fix build when enabling mdebug options.

Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10629)
Rich Salz 4 년 전
부모
커밋
f64f262204
1개의 변경된 파일18개의 추가작업 그리고 8개의 파일을 삭제
  1. 18 8
      crypto/mem.c

+ 18 - 8
crypto/mem.c

@@ -145,14 +145,6 @@ static int shouldfail(void)
         len = strlen(buff);
         len = strlen(buff);
         if (write(md_tracefd, buff, len) != len)
         if (write(md_tracefd, buff, len) != len)
             perror("shouldfail write failed");
             perror("shouldfail write failed");
-#  ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
-        if (shoulditfail) {
-            void *addrs[30];
-            int num = backtrace(addrs, OSSL_NELEM(addrs));
-
-            backtrace_symbols_fd(addrs, num, md_tracefd);
-        }
-#  endif
     }
     }
 # endif
 # endif
 
 
@@ -305,6 +297,24 @@ int CRYPTO_mem_debug_pop(void)
     return -1;
     return -1;
 }
 }
 
 
+void CRYPTO_mem_debug_malloc(void *addr, size_t num, int flag,
+                             const char *file, int line)
+{
+    (void)addr; (void)num; (void)flag; (void)file; (void)line;
+}
+
+void CRYPTO_mem_debug_realloc(void *addr1, void *addr2, size_t num, int flag,
+                              const char *file, int line)
+{
+    (void)addr1; (void)addr2; (void)num; (void)flag; (void)file; (void)line;
+}
+
+void CRYPTO_mem_debug_free(void *addr, int flag,
+                           const char *file, int line)
+{
+    (void)addr; (void)flag; (void)file; (void)line;
+}
+
 int CRYPTO_mem_leaks(BIO *b)
 int CRYPTO_mem_leaks(BIO *b)
 {
 {
     (void)b;
     (void)b;