[kaffe] CVS kaffe (dalibor): Small fix for handling of JAR files
Kaffe CVS
cvs-commits at kaffe.org
Sat Jan 10 11:58:02 PST 2004
PatchSet 4312
Date: 2004/01/10 19:54:12
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Small fix for handling of JAR files
2004-01-10 Mark Wielaard <mark at klomp.org>
* kaffe/kaffeh/support.c (kaffeh_findClass): Close jar file and
continue when getDataJarFile(0 returns NULL.
Members:
ChangeLog:1.1899->1.1900
kaffe/kaffeh/support.c:1.34->1.35
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1899 kaffe/ChangeLog:1.1900
--- kaffe/ChangeLog:1.1899 Sat Jan 10 19:38:13 2004
+++ kaffe/ChangeLog Sat Jan 10 19:54:12 2004
@@ -1,4 +1,9 @@
2004-01-10 Mark Wielaard <mark at klomp.org>
+
+ * kaffe/kaffeh/support.c (kaffeh_findClass): Close jar file and
+ continue when getDataJarFile(0 returns NULL.
+
+2004-01-10 Mark Wielaard <mark at klomp.org>
* java/util/regex/Matcher.java (find): Check whether or not we are
stuck at the same position after a successful match and bump position
Index: kaffe/kaffe/kaffeh/support.c
diff -u kaffe/kaffe/kaffeh/support.c:1.34 kaffe/kaffe/kaffeh/support.c:1.35
--- kaffe/kaffe/kaffeh/support.c:1.34 Mon Nov 3 05:57:42 2003
+++ kaffe/kaffe/kaffeh/support.c Sat Jan 10 19:54:15 2004
@@ -911,6 +911,10 @@
}
buf = getDataJarFile(jfile, jentry);
+ if (buf == NULL) {
+ closeJarFile(jfile);
+ continue;
+ }
classFileInit(&hand, buf, jentry->uncompressedSize, CP_ZIPFILE);
More information about the kaffe
mailing list