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/iconv/iconv.c (iconv_iconv): fix for length argument and now

Browse source 
allows range.  [ruby-core:17092]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-04 08:52:25 +00:00
parent eaa1f94313
commit 9e64df56ba
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Jun 4 17:52:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now
allows range. [ruby-core:17092]
Wed Jun 4 13:06:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jun 4 13:06:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (CFLAGS, CXXFLAGS): include additional flags to * configure.in (CFLAGS, CXXFLAGS): include additional flags to

39
ext/iconv/iconv.c
View file

@ -101,7 +101,7 @@ static void iconv_dfree _((void *cd));
static VALUE iconv_free _((VALUE cd)); static VALUE iconv_free _((VALUE cd));
static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen)); static VALUE iconv_try _((iconv_t cd, const char **inptr, size_t *inlen, char **outptr, size_t *outlen));
static VALUE rb_str_derive _((VALUE str, const char* ptr, int len)); static VALUE rb_str_derive _((VALUE str, const char* ptr, int len));
static VALUE iconv_convert _((iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env)); static VALUE iconv_convert _((iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env));
static VALUE iconv_s_allocate _((VALUE klass)); static VALUE iconv_s_allocate _((VALUE klass));
static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from)); static VALUE iconv_initialize _((VALUE self, VALUE to, VALUE from));
static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from)); static VALUE iconv_s_open _((VALUE self, VALUE to, VALUE from));
@ -170,7 +170,7 @@ iconv_create
} }
if (cd == (iconv_t)-1) { if (cd == (iconv_t)-1) {
int inval = errno == EINVAL; int inval = errno == EINVAL;
char *s = inval ? "invalid encoding " : "iconv"; const char *s = inval ? "invalid encoding " : "iconv";
volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len + volatile VALUE msg = rb_str_new(0, strlen(s) + RSTRING(to)->len +
RSTRING(from)->len + 8); RSTRING(from)->len + 8);
@ -362,13 +362,13 @@ rb_str_derive
static VALUE static VALUE
iconv_convert iconv_convert
#ifdef HAVE_PROTOTYPES #ifdef HAVE_PROTOTYPES
(iconv_t cd, VALUE str, int start, int length, struct iconv_env_t* env) (iconv_t cd, VALUE str, long start, long length, struct iconv_env_t* env)
#else /* HAVE_PROTOTYPES */ #else /* HAVE_PROTOTYPES */
(cd, str, start, length, env) (cd, str, start, length, env)
iconv_t cd; iconv_t cd;
VALUE str; VALUE str;
int start; long start;
int length; long length;
struct iconv_env_t *env; struct iconv_env_t *env;
#endif /* HAVE_PROTOTYPES */ #endif /* HAVE_PROTOTYPES */
{ {
@ -417,17 +417,9 @@ iconv_convert
slen = RSTRING(str)->len; slen = RSTRING(str)->len;
inptr = RSTRING(str)->ptr; inptr = RSTRING(str)->ptr;
if (start < 0 ? (start += slen) < 0 : start >= slen) inptr += start;
length = 0; if (length < 0 || length > start + slen)
else if (length < 0 && (length += slen + 1) < 0) length = slen - start;
length = 0;
else if ((length -= start) < 0)
length = 0;
else {
inptr += start;
if (length > slen)
length = slen;
}
} }
instart = inptr; instart = inptr;
inlen = length; inlen = length;
@ -757,14 +749,17 @@ iconv_iconv
{ {
VALUE str, n1, n2; VALUE str, n1, n2;
VALUE cd = check_iconv(self); VALUE cd = check_iconv(self);
long start = 0, length = 0, slen = 0;
n1 = n2 = Qnil;
rb_scan_args(argc, argv, "12", &str, &n1, &n2); rb_scan_args(argc, argv, "12", &str, &n1, &n2);
if (!NIL_P(str)) slen = RSTRING_LEN(StringValue(str));
if (argc != 2 || !RTEST(rb_range_beg_len(n1, &start, &length, slen, 0))) {
if (NIL_P(n1) || ((start = NUM2LONG(n1)) < 0 ? (start += slen) >= 0 : start < slen)) {
if (!NIL_P(n2)) length = NUM2LONG(n2);
}
}
return iconv_convert(VALUE2ICONV(cd), str, return iconv_convert(VALUE2ICONV(cd), str, start, length, NULL);
NIL_P(n1) ? 0 : NUM2INT(n1),
NIL_P(n2) ? -1 : NUM2INT(n2),
NULL);
} }
/* /*
@ -828,7 +823,7 @@ iconv_failure_inspect
VALUE self; VALUE self;
#endif /* HAVE_PROTOTYPES */ #endif /* HAVE_PROTOTYPES */
{ {
char *cname = rb_class2name(CLASS_OF(self)); const char *cname = rb_class2name(CLASS_OF(self));
VALUE success = rb_attr_get(self, rb_success); VALUE success = rb_attr_get(self, rb_success);
VALUE failed = rb_attr_get(self, rb_failed); VALUE failed = rb_attr_get(self, rb_failed);
VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname); VALUE str = rb_str_buf_cat2(rb_str_new2("#<"), cname);