<div dir="ltr">Reviewed-by: Plamena Manolova <<a href="mailto:plamena.manolova@intel.com">plamena.manolova@intel.com</a>></div><div class="gmail_extra"> <div class="gmail_quote">On Thu, Mar 16, 2017 at 8:10 AM, Tapani Pälli <<a href="mailto:tapani.palli@intel.com" target="_blank">tapani.palli@intel.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">According to dl_iterate_phdr man page first object visited is the main program where dlpi_name is an empty string. This fixes segfault on Android when using build-id as identifier. Signed-off-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>> --- src/util/build_id.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/build_id.c b/src/util/build_id.c index c53e71d..797ea22 100644 --- a/src/util/build_id.c +++ b/src/util/build_id.c @@ -55,6 +55,12 @@ build_id_find_nhdr_callback(struct dl_phdr_info *info, size_t size, void *data_) { struct callback_data *data = data_; + /* The first object visited by callback is the main program. + * For the main program, the dlpi_name field will be an empty string. + */ + if (info->dlpi_name == NULL) + return 0; + char *ptr = strstr(info->dlpi_name, data->filename); if (ptr == NULL || ptr[strlen(data->filename)] != '\0') return 0; -- 2.9.3 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>