From c976c2a75215645685c1093d5931e490603f4dd2 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 May 2003 08:48:05 +0000
Subject: * error.c (syserr_initialize): prohibit specifying errno for  
 subclasses of SystemCallError.  in addition, if initialize is   called for
 SystenCallError instance, its class be changed.   [ruby-dev:20257]

* gc.c (run_final): to protect thread context switch, finalizers
  are wrapped in DEFER_INTS/ENABLE_INTS.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 error.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

(limited to 'error.c')

diff --git a/error.c b/error.c
index 26dec201c..a90167cf2 100644
--- a/error.c
+++ b/error.c
@@ -541,21 +541,29 @@ syserr_initialize(argc, argv, self)
 #endif
     char *err;
     char *buf;
-    VALUE error, mesg;
+    VALUE mesg, error;
     VALUE klass = rb_obj_class(self);
 
-    rb_scan_args(argc, argv, klass == rb_eSystemCallError ? "11" : "02",
-		 &mesg, &error);
-    if (argc == 1 && FIXNUM_P(mesg)) {
-	error = mesg;
-	mesg = Qnil;
+    if (klass == rb_eSystemCallError) {
+	rb_scan_args(argc, argv, "11", &mesg, &error);
+	if (argc == 1 && FIXNUM_P(mesg)) {
+	    error = mesg; mesg = Qnil;
+	}
+	if (!NIL_P(error) && st_lookup(syserr_tbl, NUM2LONG(error), &klass)) {
+	    /* change class */
+	    if (TYPE(self) != T_OBJECT) { /* insurance to avoid type crash */
+		rb_raise(rb_eTypeError, "invalid instance type");
+	    }
+	    RBASIC(self)->klass = klass;
+	}
     }
-    if (klass != rb_eSystemCallError && NIL_P(error)) {
+    else {
+	rb_scan_args(argc, argv, "01", &mesg);
 	error = rb_const_get_at(klass, rb_intern("Errno"));
     }
-    err = strerror(NUM2LONG(error));
-    if (!err) err = "Unknown error";
-    if (RTEST(mesg)) {
+    if (!NIL_P(error)) err = strerror(NUM2LONG(error));
+    else err = "unknown error";
+    if (!NIL_P(mesg)) {
 	StringValue(mesg);
 	buf = ALLOCA_N(char, strlen(err)+RSTRING(mesg)->len+4);
 	sprintf(buf, "%s - %s", err, RSTRING(mesg)->ptr);
@@ -564,7 +572,6 @@ syserr_initialize(argc, argv, self)
     else {
 	mesg = rb_str_new2(err);
     }
-
     exc_initialize(1, &mesg, self);
     rb_iv_set(self, "errno", error);
     return self;
-- 
cgit