The R Project SVN – R – Diff – /branches/R-exp-R5/src/main/objects.c

     x = CAR(args);
     if(IS_S4_OBJECT(x))
       return do_S4inherits(x, CADR(args), CADDR(args));
     else
-      klass = R_data_class(x, FALSE);
+      PROTECT(klass = R_data_class(x, FALSE));
     nclass = length(klass);
     what = CADR(args);
     if(!isString(what))
 	error(_("'what' must be a character vector"));
        !isNull(R_getClassDef(translateChar(STRING_ELT(what, 0)))))
 	warning(_("use 'is()' instead of 'inherits()' on S4 objects"));
 #endif
     if(isvec)
-	rval = allocVector(INTSXP, nwhat);
+	PROTECT(rval = allocVector(INTSXP, nwhat));
     for(j = 0; j < nwhat; j++) {
 	const char *ss = translateChar(STRING_ELT(what, j));
 	for(i = 0; i < nclass; i++) {
 	    if(isvec)
 		INTEGER(rval)[j] = 0;
 	    if(!strcmp(translateChar(STRING_ELT(klass, i)), ss)) {
 		if(isvec)
 		   INTEGER(rval)[j] = i+1;
-		else
+		else {
+		    UNPROTECT(1);
 		    return mkTrue();
+		}
 		break;
+	    }
+	}
+    }
-    if(!isvec)
+    if(!isvec) {
+    	UNPROTECT(1);
 	return mkFalse();
+    }
+    UNPROTECT(2);
     return rval;
+}
 /*

The R Project SVN R