2 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 11e8cf72f8..b8f718297c 100644
--- a/file.c
+++ b/file.c
@@ -3536,7 +3536,7 @@ rmext(const char *p, long l0, long l1, const char *e, long l2, rb_encoding *enc)
     unsigned int c;
     const char *s, *last;
 
-    if (!e) return 0;
+    if (!e || !l2) return 0;
 
     c = rb_enc_codepoint_len(e, e + l2, &len1, enc);
     if (rb_enc_ascget(e + len1, e + l2, &len2, enc) == '*' && len1 + len2 == l2) {
diff --git a/version.h b/version.h
index 113105d986..ce8a5fd44d 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 303
+#define RUBY_PATCHLEVEL 304
 
 #define RUBY_RELEASE_DATE "2012-10-26"
 #define RUBY_RELEASE_YEAR 2012