src/java.base/share/native/libjimage/imageFile.cpp

@@ -317,11 +317,16 @@
      size_t header_size = sizeof(ImageHeader);
      if (_file_size < header_size ||
          !read_at((u1*)&_header, header_size, 0) ||
          _header.magic(_endian) != IMAGE_MAGIC ||
          _header.major_version(_endian) != MAJOR_VERSION ||
-         _header.minor_version(_endian) != MINOR_VERSION) {
+         // Temporarily, we allow either version (1.1 or 1.0) of the file to
+         // be read so this code can be committed before image writing changes
+         // for preview mode. Preview mode changes do not modify any structure,
+         // so a 1.0 file will look like a jimage without any preview resources.
+         // TODO: Restore equality check for MINOR_VERSION.
+         _header.minor_version(_endian) > MINOR_VERSION) {
          close();
          return false;
      }
      // Size of image index.
      _index_size = index_size();

@@ -402,11 +407,11 @@
          // Expand location attributes.
          ImageLocation location(data);
          // Make sure result is not a false positive.
          if (verify_location(location, path)) {
                  *size = (jlong)location.get_attribute(ImageLocation::ATTRIBUTE_UNCOMPRESSED);
-                 return offset;
+             return offset;
          }
      }
      return 0;            // not found
  }
  

@@ -433,11 +438,11 @@
          if (!(next = ImageStrings::starts_with(next, parent))) return false;
          if (*next++ != '/') return false;
      }
      // Get base name string.
      const char* base = location.get_attribute(ImageLocation::ATTRIBUTE_BASE, strings);
-     // Compare with basne name.
+     // Compare with base name.
      if (!(next = ImageStrings::starts_with(next, base))) return false;
      // Get extension string.
      const char* extension = location.get_attribute(ImageLocation::ATTRIBUTE_EXTENSION, strings);
      // If extension is not empty.
      if (*extension != '\0') {