summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-12 00:36:54 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-12 00:36:54 +0000
commit4d467a08650273f3e20dbc4dc78592a2237362a9 (patch)
tree821d252ade8e1942f20425e05a6708f0d8b5e57a /ext
parent1ca94a03074888fe3c2b725a82bbbe539c5fdd98 (diff)
* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
protect temporary context object. [ruby-dev:27979] * ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should be called before actual variable initialization. [ruby-dev:27986] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/digest/digest.c92
-rw-r--r--ext/digest/digest.h10
-rw-r--r--ext/etc/etc.c4
-rw-r--r--ext/iconv/iconv.c2
-rw-r--r--ext/win32ole/win32ole.c4
5 files changed, 35 insertions, 77 deletions
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 70f986327af..a63d353ddfe 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -41,8 +41,7 @@ static ID id_metadata;
*/
static algo_t *
-get_digest_base_metadata(klass)
- VALUE klass;
+get_digest_base_metadata(VALUE klass)
{
VALUE obj;
algo_t *algo;
@@ -58,10 +57,8 @@ get_digest_base_metadata(klass)
return algo;
}
-static VALUE rb_digest_base_alloc _((VALUE));
static VALUE
-rb_digest_base_alloc(klass)
- VALUE klass;
+rb_digest_base_alloc(VALUE klass)
{
algo_t *algo;
VALUE obj;
@@ -83,15 +80,12 @@ rb_digest_base_alloc(klass)
}
static VALUE
-rb_digest_base_s_digest(klass, str)
- VALUE klass;
- VALUE str;
+rb_digest_base_s_digest(VALUE klass, VALUE str)
{
algo_t *algo;
void *pctx;
- size_t len;
unsigned char *digest;
- VALUE obj = rb_digest_base_alloc(klass);
+ volatile VALUE obj = rb_digest_base_alloc(klass);
algo = get_digest_base_metadata(klass);
Data_Get_Struct(obj, void, pctx);
@@ -99,28 +93,19 @@ rb_digest_base_s_digest(klass, str)
StringValue(str);
algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
- len = algo->digest_len;
-
- digest = xmalloc(len);
- algo->final_func(digest, pctx);
-
- obj = rb_str_new(digest, len);
-
- free(digest);
+ str = rb_str_new(0, algo->digest_len);
+ algo->final_func(RSTRING(str)->ptr, pctx);
- return obj;
+ return str;
}
static VALUE
-rb_digest_base_s_hexdigest(klass, str)
- VALUE klass;
- VALUE str;
+rb_digest_base_s_hexdigest(VALUE klass, VALUE str)
{
algo_t *algo;
void *pctx;
- size_t len;
unsigned char *hexdigest;
- VALUE obj = rb_digest_base_alloc(klass);
+ volatile VALUE obj = rb_digest_base_alloc(klass);
algo = get_digest_base_metadata(klass);
Data_Get_Struct(obj, void, pctx);
@@ -128,21 +113,14 @@ rb_digest_base_s_hexdigest(klass, str)
StringValue(str);
algo->update_func(pctx, RSTRING(str)->ptr, RSTRING(str)->len);
- len = algo->digest_len * 2;
-
- hexdigest = xmalloc(len + 1); /* +1 is for '\0' */
- algo->end_func(pctx, hexdigest);
-
- obj = rb_str_new(hexdigest, len);
+ str = rb_str_new(0, algo->digest_len * 2);
+ algo->end_func(pctx, RSTRING(str)->ptr);
- free(hexdigest);
-
- return obj;
+ return str;
}
static VALUE
-rb_digest_base_copy(copy, obj)
- VALUE copy, obj;
+rb_digest_base_copy(VALUE copy, VALUE obj)
{
algo_t *algo;
void *pctx1, *pctx2;
@@ -161,8 +139,7 @@ rb_digest_base_copy(copy, obj)
}
static VALUE
-rb_digest_base_update(self, str)
- VALUE self, str;
+rb_digest_base_update(VALUE self, VALUE str)
{
algo_t *algo;
void *pctx;
@@ -177,10 +154,7 @@ rb_digest_base_update(self, str)
}
static VALUE
-rb_digest_base_init(argc, argv, self)
- int argc;
- VALUE* argv;
- VALUE self;
+rb_digest_base_init(int argc, VALUE *argv, VALUE self)
{
VALUE arg;
@@ -192,8 +166,7 @@ rb_digest_base_init(argc, argv, self)
}
static VALUE
-rb_digest_base_digest(self)
- VALUE self;
+rb_digest_base_digest(VALUE self)
{
algo_t *algo;
void *pctx1, *pctx2;
@@ -204,58 +177,43 @@ rb_digest_base_digest(self)
algo = get_digest_base_metadata(rb_obj_class(self));
Data_Get_Struct(self, void, pctx1);
- len = algo->ctx_size;
+ str = rb_str_new(0, algo->digest_len);
+ len = algo->ctx_size;
pctx2 = xmalloc(len);
memcpy(pctx2, pctx1, len);
- len = algo->digest_len;
-
- digest = xmalloc(len);
- algo->final_func(digest, pctx2);
-
- str = rb_str_new(digest, len);
-
- free(digest);
+ algo->final_func(RSTRING(str)->ptr, pctx2);
free(pctx2);
return str;
}
static VALUE
-rb_digest_base_hexdigest(self)
- VALUE self;
+rb_digest_base_hexdigest(VALUE self)
{
algo_t *algo;
void *pctx1, *pctx2;
- unsigned char *hexdigest;
size_t len;
VALUE str;
algo = get_digest_base_metadata(rb_obj_class(self));
Data_Get_Struct(self, void, pctx1);
- len = algo->ctx_size;
+ str = rb_str_new(0, algo->digest_len * 2);
+ len = algo->ctx_size;
pctx2 = xmalloc(len);
memcpy(pctx2, pctx1, len);
- len = algo->digest_len * 2;
-
- hexdigest = xmalloc(len + 1); /* +1 is for '\0' */
- algo->end_func(pctx2, hexdigest);
-
- str = rb_str_new(hexdigest, len);
-
- free(hexdigest);
+ algo->end_func(pctx2, RSTRING(str)->ptr);
free(pctx2);
return str;
}
static VALUE
-rb_digest_base_equal(self, other)
- VALUE self, other;
+rb_digest_base_equal(VALUE self, VALUE other)
{
algo_t *algo;
VALUE klass;
@@ -282,7 +240,7 @@ rb_digest_base_equal(self, other)
str1 = rb_digest_base_hexdigest(self);
if (RSTRING(str1)->len == RSTRING(str2)->len
- && rb_str_cmp(str1, str2) == 0)
+ && rb_str_cmp(str1, str2) == 0)
return Qtrue;
return Qfalse;
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 5e846df040e..878aaddd025 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -15,11 +15,11 @@
#include "ruby.h"
-typedef void (*hash_init_func_t) _((void *));
-typedef void (*hash_update_func_t) _((void *, unsigned char *, size_t));
-typedef void (*hash_end_func_t) _((void *, unsigned char *));
-typedef void (*hash_final_func_t) _((unsigned char *, void *));
-typedef int (*hash_equal_func_t) _((void *, void *));
+typedef void (*hash_init_func_t)(void *);
+typedef void (*hash_update_func_t)(void *, unsigned char *, size_t);
+typedef void (*hash_end_func_t)(void *, unsigned char *);
+typedef void (*hash_final_func_t)(unsigned char *, void *);
+typedef int (*hash_equal_func_t)(void *, void *);
typedef struct {
size_t digest_len;
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 94196e066a0..ac95735549c 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -521,6 +521,7 @@ Init_etc()
rb_define_module_function(mEtc, "endgrent", etc_endgrent, 0);
rb_define_module_function(mEtc, "getgrent", etc_getgrent, 0);
+ rb_global_variable(&sPasswd);
sPasswd = rb_struct_define("Passwd",
"name", "passwd", "uid", "gid",
#ifdef HAVE_ST_PW_GECOS
@@ -546,14 +547,13 @@ Init_etc()
"expire",
#endif
NULL);
- rb_global_variable(&sPasswd);
#ifdef HAVE_GETGRENT
+ rb_global_variable(&sGroup);
sGroup = rb_struct_define("Group", "name",
#ifdef HAVE_ST_GR_PASSWD
"passwd",
#endif
"gid", "mem", NULL);
- rb_global_variable(&sGroup);
#endif
}
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index a1aa484c684..cebbd912fe9 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -1083,8 +1083,8 @@ Init_iconv(void)
id_transliterate = rb_intern("transliterate");
id_discard_ilseq = rb_intern("discard_ilseq");
- charset_map = rb_hash_new();
rb_gc_register_address(&charset_map);
+ charset_map = rb_hash_new();
rb_define_singleton_method(rb_cIconv, "charset_map", charset_map_get, 0);
}
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 32d92b639ed..fde5d2d456b 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -6904,8 +6904,8 @@ folevariant_value(self)
void
Init_win32ole()
{
- ary_ole_event = rb_ary_new();
rb_global_variable(&ary_ole_event);
+ ary_ole_event = rb_ary_new();
id_events = rb_intern("events");
com_vtbl.QueryInterface = QueryInterface;
@@ -6915,8 +6915,8 @@ Init_win32ole()
com_vtbl.GetTypeInfo = GetTypeInfo;
com_vtbl.GetIDsOfNames = GetIDsOfNames;
com_vtbl.Invoke = Invoke;
- com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
rb_global_variable(&com_hash);
+ com_hash = Data_Wrap_Struct(rb_cData, rb_mark_hash, st_free_table, st_init_numtable());
cWIN32OLE = rb_define_class("WIN32OLE", rb_cObject);