summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-04 01:32:38 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-07-04 01:32:38 +0000
commitdfbbe2ef6b0abdd7ba3577dea5f44220d70b59c3 (patch)
tree8994347c411976e18ef390fd1b24a9992373c805
parent74c0b5932fd728cc89a19861e3c29381577b8d58 (diff)
Fix previous commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--file.c3
-rw-r--r--version.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/file.c b/file.c
index d4a24dd126..0310f235ca 100644
--- a/file.c
+++ b/file.c
@@ -3456,9 +3456,10 @@ rmext(const char *p, long l0, long l1, const char *e)
{
long l2;
- if (!e || !l2) return 0;
+ if (!e) return 0;
l2 = strlen(e);
+ if (!l2) return 0;
if (l2 == 2 && e[1] == '*') {
unsigned char c = *e;
e = p + l1;
diff --git a/version.h b/version.h
index 1931c199f4..96da8cc44d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 251
+#define RUBY_PATCHLEVEL 252
#define RUBY_RELEASE_DATE "2012-07-04"
#define RUBY_RELEASE_YEAR 2012