* dln.c (dln_find_1): break if path list end, even for too long

nobu · nobu · commit 32eb0d1998cd · 2003-03-26T11:27:00.000Z
path names.  (ruby-bugs-ja:PR#412)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@3618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 26 20:26:17 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* dln.c (dln_find_1): break if path list end, even for too long
+	  path names.  (ruby-bugs-ja:PR#412)
+
 Sun Mar 23 22:22:04 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* lib/jcode.rb (tr!, delete!, szueeze!): add empty string checking.
diff --git a/dln.c b/dln.c
@@ -1670,7 +1670,7 @@ dln_find_1(fname, path, exe_flag)
 	    *bp = '\0';
 	    fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);
 	    fprintf(stderr, "\tFile \"%s\"\n", fname);
-	    continue;
+	    goto next;
 	}
 	memcpy(bp, fname, i + 1);
 
@@ -1724,6 +1724,8 @@ dln_find_1(fname, path, exe_flag)
 	    }
 	}
 #endif /* MSDOS or NT or __human68k__ or __EMX__ */
+
+      next:
 	/* if not, and no other alternatives, life is bleak */
 	if (*ep == '\0') {
 	    return NULL;

Original file line number	Diff line number	Diff line change
`@@ -1670,7 +1670,7 @@ dln_find_1(fname, path, exe_flag)`
`1670`	`1670`	`*bp = '\0';`
`1671`	`1671`	`fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);`
`1672`	`1672`	`fprintf(stderr, "\tFile \"%s\"\n", fname);`
`1673`		`- continue;`
	`1673`	`+ goto next;`
`1674`	`1674`	`}`
`1675`	`1675`	`memcpy(bp, fname, i + 1);`
`1676`	`1676`
`@@ -1724,6 +1724,8 @@ dln_find_1(fname, path, exe_flag)`
`1724`	`1724`	`}`
`1725`	`1725`	`}`
`1726`	`1726`	`#endif /* MSDOS or NT or __human68k__ or __EMX__ */`
	`1727`	`+`
	`1728`	`+ next:`
`1727`	`1729`	`/* if not, and no other alternatives, life is bleak */`
`1728`	`1730`	`if (*ep == '\0') {`
`1729`	`1731`	`return NULL;`