GNU header update.

[cacao.git] / src / native / vm / VMClassLoader.c

diff --git a/src/native/vm/VMClassLoader.c b/src/native/vm/VMClassLoader.c
index 0312afeea8ac5ef5c2e332314c89850aef2b0e92..a7086c43ac445e0163251aee8941839724166f67 100644 (file)
--- a/src/native/vm/VMClassLoader.c
+++ b/src/native/vm/VMClassLoader.c
@@ -1,9 +1,9 @@
-/* nat/VMClassLoader.c - java/lang/ClassLoader
+/* native/vm/VMClassLoader.c - java/lang/VMClassLoader
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -28,21 +28,21 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMClassLoader.c 1314 2004-07-14 18:31:49Z twisti $
+   $Id: VMClassLoader.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
 
-#include "jni.h"
-#include "loader.h"
-#include "native.h"
-#include "builtin.h"
-#include "tables.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_Class.h"
+#include "native/include/java_lang_String.h"
+#include "native/include/java_lang_ClassLoader.h"
 #include "toolbox/logging.h"
-#include "nat/java_lang_Class.h"
-#include "nat/java_lang_String.h"
-#include "nat/java_lang_ClassLoader.h"
-#include "nat/java_net_URL.h"
+#include "vm/exceptions.h"
+#include "vm/builtin.h"
+#include "vm/loader.h"
+#include "vm/tables.h"
 
 
 /*
@@ -56,13 +56,23 @@ JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_defineClass(JNIE
 
        log_text("Java_java_lang_VMClassLoader_defineClass called");
 
+       if (off < 0 || len < 0 || off + len > buf->header.size) {
+               *exceptionptr =
+                       new_exception(string_java_lang_IndexOutOfBoundsException);
+               return NULL;
+       }
+
        /* call JNI-function to load the class */
        c = (*env)->DefineClass(env,
-                                                       javastring_tochar((java_objectheader*) name),
+                                                       javastring_tochar((java_objectheader *) name),
                                                        (jobject) this,
-                                                       (const jbyte *) &buf[off],
+                                                       (const jbyte *) &buf->data[off],
                                                        len);
 
+       /* exception? return! */
+       if (!c)
+               return NULL;
+
        use_class_as_object(c);
 
        return (java_lang_Class *) c;
@@ -70,7 +80,7 @@ JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_defineClass(JNIE
 
 
 /*
- * Class:     java/lang/Class
+ * Class:     java/lang/ClassLoader
  * Method:    getPrimitiveClass
  * Signature: (Ljava/lang/String;)Ljava/lang/Class;
  */
@@ -79,20 +89,24 @@ JNIEXPORT java_lang_Class* JNICALL Java_java_lang_VMClassLoader_getPrimitiveClas
        classinfo *c;
        utf *u = javastring_toutf(name, false);
 
-       if (u) {
-               /* get primitive class */
-               c = class_new(u);
-               class_load(c);
-               class_init(c);
-               use_class_as_object(c);
-
-               return (java_lang_Class *) c;
+       /* illegal primitive classname specified */
+       if (!u) {
+               *exceptionptr = new_exception(string_java_lang_ClassNotFoundException);
+               return NULL;
        }
 
-       /* illegal primitive classname specified */
-       *exceptionptr = new_exception(string_java_lang_ClassNotFoundException);
+       /* get primitive class */
+       c = class_new(u);
 
-       return NULL;
+       if (!class_load(c))
+               return NULL;
+
+       if (!class_init(c))
+               return NULL;
+
+       use_class_as_object(c);
+
+       return (java_lang_Class *) c;
 }