kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/stringio/stringio.c (strio_initialize): RSTRING(mode)->ptr

Browse source 
can be NULL.

* ext/stringio/stringio.c (strio_ungetc): fix buffer overflow.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-08-28 10:14:06 +00:00
parent 4c59a65d04
commit 343f505fb8
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Wed Aug 28 19:12:46 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ext/stringio/stringio.c (strio_initialize): RSTRING(mode)->ptr
can be NULL.
* ext/stringio/stringio.c (strio_ungetc): fix buffer overflow.
Wed Aug 28 18:19:55 2002 Michal Rokos <michal@ruby-lang.org>
* file.c: fix memory leak in rb_stat_init.

23
ext/stringio/stringio.c
View file

@ -205,6 +205,7 @@ strio_initialize(argc, argv, self)
{
struct StringIO *ptr = check_strio(self);
VALUE string, mode;
const char* m;
if (!ptr) {
DATA_PTR(self) = ptr = strio_alloc();
@ -214,12 +215,13 @@ strio_initialize(argc, argv, self)
case 2:
StringValue(mode);
StringValue(string);
ptr->flags = rb_io_mode_flags(RSTRING(mode)->ptr);
if (!(m = RSTRING(mode)->ptr)) m = "";
ptr->flags = rb_io_mode_flags(m);
if (ptr->flags & FMODE_WRITABLE && OBJ_FROZEN(string)) {
errno = EACCES;
rb_sys_fail(0);
}
switch (*RSTRING(mode)->ptr) {
switch (*m) {
case 'a':
ptr->flags |= STRIO_APPEND;
break;
@ -543,14 +545,23 @@ strio_ungetc(self, ch)
{
struct StringIO *ptr = readable(StringIO(self));
int cc = NUM2INT(ch);
long len, pos = ptr->pos;
if (cc != EOF && ptr->pos > 0) {
if ((unsigned char)RSTRING(ptr->string)->ptr[--ptr->pos] !=
if (cc != EOF && pos > 0) {
if ((len = RSTRING(ptr->string)->len) < pos ||
(unsigned char)RSTRING(ptr->string)->ptr[pos - 1] !=
(unsigned char)cc) {
check_modifiable(ptr);
rb_str_modify(ptr->string);
RSTRING(ptr->string)->ptr[ptr->pos] = cc;
if (len < pos) {
rb_str_resize(ptr->string, pos);
MEMZERO(RSTRING(ptr->string)->ptr + len, char, pos - len - 1);
}
else {
rb_str_modify(ptr->string);
}
RSTRING(ptr->string)->ptr[pos - 1] = cc;
}
--ptr->pos;
}
return Qnil;
}