xserver: Branch 'master'

[Adam Jackson]

 os/backtrace.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 272fa1817091117d078a22252a03d3161dfc7b0f
Author: Jeffrey Smith <whydoubt at gmail.com>
Date:   Thu Feb 15 23:47:46 2018 -0600

    os: avoid uninitialized offsets in backtrace
    
    When xorg_backtrace calls unw_get_proc_name and an error occurs, offset
    might not be set for the current frame.
    
    Initialize offset for each frame so that the offset from another frame
    cannot be used inadvertently.
    
    Signed-off-by: Jeff Smith <whydoubt at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>

diff --git a/os/backtrace.c b/os/backtrace.c
index 9e3e38edf..619bf145e 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -78,6 +78,7 @@ xorg_backtrace(void)
             break;
         }
 
+        off = 0;
         ret = unw_get_proc_name(&cursor, procname, 256, &off);
         if (ret && ret != -UNW_ENOMEM) {
             if (ret != -UNW_EUNSPEC)