diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-18 11:51:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-02-18 11:51:10 +0000 |
commit | 7ef48b40badefe862f3b96ec7d2f687406876d81 (patch) | |
tree | fab76c72ef451e83e55167fecc1f0b8d0fcbd86e | |
parent | 7de72c4858a8240ae025aecb3599291f0bf90e34 (diff) |
* pack.c (pack_pack): avoid infinite loop at comment.
* pack.c (pack_unpack): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | pack.c | 6 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Mon Feb 18 20:48:40 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> + + * pack.c (pack_pack): avoid infinite loop at comment. + + * pack.c (pack_unpack): ditto. + Mon Feb 18 14:06:28 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * misc/ruby-mode.el (ruby-block-hanging-re): rescue block was too @@ -63,7 +69,6 @@ Thu Feb 16 02:11:08 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * misc/ruby-mode.el (ruby-font-lock-keywords): fontify instance/class/global variables start with '_'. ->>>>>>> 1.742 Fri Feb 15 14:40:38 2002 Yukihiro Matsumoto <matz@ruby-lang.org> * eval.c (rb_eval): replace rb_cvar_declare() by rb_cvar_set(). @@ -364,8 +364,7 @@ pack_pack(ary, fmt) if (ISSPACE(type)) continue; if (type == '#') { - while (p < pend) { - if (*p == '\n') continue; + while ((p < pend) && (*p != '\n')) { p++; } break; @@ -1084,8 +1083,7 @@ pack_unpack(str, fmt) if (ISSPACE(type)) continue; if (type == '#') { - while (p < pend) { - if (*p == '\n') continue; + while ((p < pend) && (*p != '\n')) { p++; } break; |