Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
vm/classloader.c | 3 ++-
vm/jato.c | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/vm/classloader.c b/vm/classloader.c
index b99701a..0ed65b1 100644
--- a/vm/classloader.c
+++ b/vm/classloader.c
@@ -292,7 +292,8 @@ struct vm_class *classloader_load_primitive(const char
*class_name)
cache_index = str_to_type(class_name);
- assert(cache_index != J_VOID && cache_index != J_REFERENCE);
+ if (cache_index == J_VOID || cache_index == J_REFERENCE)
+ return NULL;
if (primitive_class_cache[cache_index])
return primitive_class_cache[cache_index];
diff --git a/vm/jato.c b/vm/jato.c
index 3ee9bd6..60df698 100644
--- a/vm/jato.c
+++ b/vm/jato.c
@@ -206,8 +206,10 @@ native_vmclassloader_getprimitiveclass(int type)
primitive_class_name[0] = (char)type;
class = classloader_load_primitive(primitive_class_name);
- vm_class_ensure_init(class);
+ if (!class)
+ return NULL;
+ vm_class_ensure_init(class);
return class->object;
}
--
1.6.0.6
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
