database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-03 13:41:29 +02:00
parent 4d41f316c3 555c6632c6
commit c32f71af7e
109 changed files with 1448 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mysys/stacktrace.c
View File

@@ -34,19 +34,20 @@
#include <execinfo.h>
#endif
#ifdef __linux__
#define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
static char *heap_start;
#if(defined HAVE_BSS_START) && !(defined __linux__)
extern char *__bss_start;
#endif
#else
#define PTR_SANE(p) (p)
#endif /* __linux */
void my_init_stacktrace()
{
#if(defined HAVE_BSS_START) && !(defined __linux__)
#ifdef __linux__
heap_start = (char*) &__bss_start;
#endif
#endif /* __linux */
}
#ifdef __linux__
@@ -149,15 +150,15 @@ static int safe_print_str(const char *addr, size_t max_len)
int my_safe_print_str(const char* val, size_t max_len)
{
#ifdef __linux__
char *heap_end;
#ifdef __linux__
// Try and make use of /proc filesystem to safely print memory contents.
if (!safe_print_str(val, max_len))
return 0;
#endif
heap_end= (char*) sbrk(0);
#endif
if (!PTR_SANE(val))
{