diff --git a/ChangeLog b/ChangeLog
index 36ce0a0617..8649c51e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Mar 26 01:34:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): skip if path is NULL.
+
 Tue Mar 25 23:57:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* parse.y (parser_yylex): only a newline after label should be
diff --git a/addr2line.c b/addr2line.c
index 854dbc62ab..0123aff5f9 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -581,7 +581,7 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	    for (i = offset; i < num_traces; i++) {
 		intptr_t d = (intptr_t)traces[i] - saddr;
 		const char *path = lines[i].path;
-		if (path && strcmp(lines[offset].path, path) != 0)
+		if (!path || strcmp(lines[offset].path, path) != 0)
 		    continue;
 		if (d <= 0 || d > (intptr_t)sym->st_size)
 		    continue;