[Libreoffice-commits] core.git: sal/osl

[Damjan Jovanovic]

 sal/osl/unx/backtrace.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa326746ba70b0302f11533a5cf36daaa6235d04
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Thu Nov 26 19:02:59 2015 +0000

    fix the value of FRAME_PTR_OFFSET
    
    in backtrace.c and diagnose.c - it's 3 because of the EBP/RBP register's
    position in the jmp_buf
    (https://github.com/freebsd/freebsd/blob/master/lib/libc/amd64/gen/_setjmp.S
    and
    https://github.com/freebsd/freebsd/blob/master/lib/libc/i386/gen/_setjmp.S).
    
    Patch by: me
    
    (cherry picked from commit 87451f66edfa425e51289ac6f12ee110d7109a02)
    
    Change-Id: I5f18cd9145f90db351c124c6f914411f1ffc2a83

diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
index 43a13d8..340b507 100644
--- a/sal/osl/unx/backtrace.c
+++ b/sal/osl/unx/backtrace.c
@@ -138,7 +138,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
 #include <stdio.h>
 #include "backtrace.h"
 
-#define FRAME_PTR_OFFSET 1
+#define FRAME_PTR_OFFSET 3
 #define FRAME_OFFSET 0
 
 int backtrace( void **buffer, int max_frames )