8302337: JDK crashes if lib/modules contains non-zero byte containing ATTRIBUTE_END

Reviewed-by: stuefe, jlaskey, alanb
2023-02-14 09:27:36 +00:00 · 2023-02-14 09:27:36 +00:00 · ee5f6e156d
commit ee5f6e156d
parent 7f71a1040d
1 changed files with 3 additions and 0 deletions
--- a/src/java.base/share/native/libjimage/imageFile.cpp
+++ b/src/java.base/share/native/libjimage/imageFile.cpp
@ -130,6 +130,9 @@ void ImageLocation::set_data(u1* data) {
        // Extract kind from header byte.
        u1 kind = attribute_kind(byte);
        assert(kind < ATTRIBUTE_COUNT && "invalid image location attribute");
+        if (kind == ATTRIBUTE_END) {
+            break;
+        }
        // Extract length of data (in bytes).
        u1 n = attribute_length(byte);
        // Read value (most significant first.)