--- libelf/elf_getarsym.c	2015-10-12 12:22:58.000000000 +0200
+++ libelf/elf_getarsym.c	2015-11-20 05:01:57.762046695 +0100
@@ -297,7 +297,7 @@
 		arsym[cnt].as_off = (*u32)[cnt];
 
 	      arsym[cnt].as_hash = _dl_elf_hash (str_data);
-	      str_data = rawmemchr (str_data, '\0') + 1;
+	      str_data = memchr (str_data, '\0', SIZE_MAX) + 1;
 	    }
 
 	  /* At the end a special entry.  */