* array.c (rb_ary_and): should not push frozen key string.

* array.c (rb_ary_or): ditto.

* eval.c (rb_thread_schedule): should save context before raising
  deadlock, saved context for current thread might be obsolete.

* time.c (make_time_t): non DST timezone shift supported (hopefully).

* time.c (make_time_t): strict range detection for negative time_t.

* signal.c: SIGINFO added.

* eval.c (rb_ensure): should not SEGV when prot_tag is NULL.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1399 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 2 deletions

diff --git a/dir.c b/dir.c
index a49b24475..f53d7a1ca 100644
--- a/dir.c
+++ b/dir.c
@@ -598,8 +598,7 @@ remove_backslashes(p)
 
     while (p < pend) {
 	if (*p == '\\') {
-	    *p++;
-	    if (p == pend) break;
+	    if (++p == pend) break;
 	}
 	*t++ = *p++;
     }