Merge branch 'main' into fix_ossfuzz_439237843

Author: cary-ilm

src/lib/OpenEXRCore/internal_ht.cpp

@@ -63,7 +63,7 @@ class staticmem_outfile : public ojph::outfile_base
      *  @param ptr is a pointer to new data.
      *  @param size the number of bytes in the new data.
      */
-    size_t write (const void* ptr, size_t sz)
+    size_t write (const void* ptr, size_t sz) override
     {
         assert (this->is_open);
         assert (this->buf);
@@ -157,8 +157,8 @@ class staticmem_outfile : public ojph::outfile_base
     ojph::ui8 *cur_ptr;
   };
 
-extern "C" exr_result_t
-internal_exr_undo_ht (
+static exr_result_t
+ht_undo_impl (
     exr_decode_pipeline_t* decode,
     const void*            compressed_data,
     uint64_t               comp_buf_size,
@@ -328,7 +328,31 @@ internal_exr_undo_ht (
 }
 
 extern "C" exr_result_t
-internal_exr_apply_ht (exr_encode_pipeline_t* encode)
+internal_exr_undo_ht (
+    exr_decode_pipeline_t* decode,
+    const void*            compressed_data,
+    uint64_t               comp_buf_size,
+    void*                  uncompressed_data,
+    uint64_t               uncompressed_size)
+{
+    try
+    {
+        return ht_undo_impl (decode, compressed_data, comp_buf_size,
+                             uncompressed_data, uncompressed_size);
+    }
+    catch ( ... )
+    {
+    }
+
+    return EXR_ERR_CORRUPT_CHUNK;
+}
+
+
+////////////////////////////////////////
+
+
+static exr_result_t
+ht_apply_impl (exr_encode_pipeline_t* encode)
 {
     exr_result_t rv = EXR_ERR_SUCCESS;
 
@@ -503,3 +527,17 @@ internal_exr_apply_ht (exr_encode_pipeline_t* encode)
 
     return rv;
 }
+
+extern "C" exr_result_t
+internal_exr_apply_ht (exr_encode_pipeline_t* encode)
+{
+    try
+    {
+        return ht_apply_impl (encode);
+    }
+    catch ( ... )
+    {
+    }
+
+    return EXR_ERR_INCORRECT_CHUNK;
+}

website/index.rst

@@ -78,6 +78,10 @@ arrays.
 Quick Start
 ===========
 
+You can :doc:`install <install>` OpenEXR using package managers or
+build the library yourself from the `source on github <https://github.com/AcademySoftwareFoundation/openexr>`_
+following the :ref:`compile instructions <build-from-source>`
+
 For a simple program that uses the C++ API to read and write a ``.exr`` file, see the
 :doc:`HelloWorld` examples.
 

website/install.rst

@@ -66,6 +66,8 @@ Install via `vcpkg <https://vcpkg.io/en/packages>`_:
    % .\vcpkg install openexr
 
 
+.. _build-from-source:
+
 Build from Source
 -----------------
 
@@ -76,8 +78,18 @@ Download the source from the `GitHub releases page
 <https://github.com/AcademySoftwareFoundation/openexr/releases>`_
 page, or clone the `repo <https://github.com/AcademySoftwareFoundation/openexr>`_.
 
-The ``release`` branch of the repo always points to the most advanced
-release.
+If cloning the repo, check out the ``release`` branch:
+
+.. code-block::
+
+   % git checkout release
+
+The ``release`` branch of the repo always points to the most advanced stable
+release. Other branches may contain compatible updates to older releases.
+
+The default ``main`` branch may contain experimental features which could change in future
+versions. It should only be used for testing, or for developers contributing to
+the OpenEXR project.
 
 
 Prerequisites