From 70e7f3dec0ad05de4bf555ff4a6db53dea0c99e6 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 14:45:12 +0000 Subject: merges r23906 from trunk into ruby_1_9_1. -- * dln.c (dln_find_1): fixed index overrun. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ dln.c | 4 ++-- version.h | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaecb649a..39a2e4f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jun 30 11:05:59 2009 Nobuyoshi Nakada + + * dln.c (dln_find_1): fixed index overrun. + Mon Jun 29 18:55:55 2009 Nobuyoshi Nakada * dln.c (dln_find_1): fix for files with dots. [ruby-dev:38588] diff --git a/dln.c b/dln.c index 23df91aaa..8826e94c5 100644 --- a/dln.c +++ b/dln.c @@ -1564,8 +1564,8 @@ dln_find_1(const char *fname, const char *path, char *fbuf, int size, } } if (ext) { - for (j = 0; STRCASECMP(ext, extension[j]); j++) { - if (j == sizeof(extension) / sizeof(extension[0])) { + for (j = 0; STRCASECMP(ext, extension[j]); ) { + if (++j == sizeof(extension) / sizeof(extension[0])) { ext = 0; break; } diff --git a/version.h b/version.h index 994f6caea..88a320b2d 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-07-12" -#define RUBY_PATCHLEVEL 210 +#define RUBY_PATCHLEVEL 211 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit