Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hdf5 merge issue 435 to hdf5_1_10 #461

Closed
wants to merge 1,136 commits into from
Closed

Hdf5 merge issue 435 to hdf5_1_10 #461

wants to merge 1,136 commits into from

Conversation

lrknox
Copy link
Collaborator

@lrknox lrknox commented Mar 10, 2021

Pull request to merge PRs # 427,428,434 and 437. Merging PR #425 is also in issue #435 but will be assigned to the original developer due to conflicts.

derobins and others added 30 commits July 9, 2020 17:00
Also fixed the issue with the H5S_diminfo_valid_t enum from the
last commit.
…10 to hdf5_1_10

* commit '443aa9a38f59bf4148925a86c07cfe14bac9e888':
  Moved over the H5S_hyper_diminfo_t from develop.
  Moved hyperslab code to use the new H5S_diminfo_valid_t enum.
  H5S_hyper_adjust_s() optimization from develop.
  Fixed Duff's device fall through warnings in hyperslab code.
  H5F and H5FS normalization with develop.
  Minor renaming in H5S hyperslab code.
…to develop

* commit '800f93f7c994f88dfa716746153ded4b1e690e3a':
  Remove path to szip header file from AM_CPPFLAGS when configure check of libsz fails. Fix for HDFFV-10830.
…0 to hdf5_1_10

* commit 'fe18e4fd13bdc6433f46b8f35d6057acb306b824':
  Merge pull request #2686 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
Add build folder as Include for generated files
Add install option for copying Fortran mod files to include folder
Add PRI defines to win32defs file
Exclude mingw from extra flags
…_10_merge to hdf5_1_10

* commit '02762e8244741b9ff1f9203788e7237f53cf8d96':
  Merge of dataspace improvements from develop.
* commit '8b6cd7cfddf91308cf860f2da3d28e208fd89788':
  Merge of dataspace improvements from develop.
…to hdf5_1_10

* commit '8c9b3d240c0e89cb6f538ee9d567dfa0e7fff6c0':
  CMake updates:
…ormalization to hdf5_1_10

* commit '795a2e5058c6214df1777a073e6b058638377003':
  Normalization with develop.
…ormalization to hdf5_1_10

* commit 'aecefbb2f5737890a27dcfd2ef20276d2ff88b2a':
  Corrected missing H5CS thread-safety change.
  Brought over thread-safety changes from develop.
…to hdf5_1_10

* commit '892ccb28fbf37b196dfea9043b09b1dae8e8d501':
  Examples DESTDIR and github action
…ix/HDFFV-11080-heap-use-after-free-by-the-call to develop

* commit '3023b34272cc6ada84aebfa7441a6a55afa3621c':
  Update MANIFEST. Add new test to Cmake.
  Fix for jira issue HDFFV-11080: (1) Patch up the file pointer when reading attribute of variable length datatype (2) Test to verify the fix when doing multiple threads
…ix/110_HDFFV-11080-heap-use-after-free-by-the-call to hdf5_1_10

* commit 'bdc6edfc5ce07363faf79519389ef149a4094530':
  Supply the appropriate file pointer to H5T_patch_vlen_file() without H5F_VOL_OBJ from develop branch.
  Merge pull request #2693 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-11080-heap-use-after-free-by-the-call to develop
* commit '475120abfb493098e907fe40073260f48b35d15d':
  Supply the appropriate file pointer to H5T_patch_vlen_file() without H5F_VOL_OBJ from develop branch.
  Merge pull request #2693 in HDFFV/hdf5 from ~VCHOI/my_third_fork:bugfix/HDFFV-11080-heap-use-after-free-by-the-call to develop
…to hdf5_1_10

* commit '7ff2d27e5b268dd3576ce4fc87be69ae06118058':
  Add missing VFD open loop
  Merge changes from dev
  Merge from dev of tools changes
…to hdf5_1_10

* commit '5c4a6949c403afcaae484588a93063d37175e1a8':
  Correct reference file
  Correct h5diff test file names
lrknox and others added 14 commits March 1, 2021 10:35
* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Modify temporary rpath for testing in java example scripts. (#230)

* Fix undefined left shifting of negative numbers (#338)

Undefined Bahavior Sanitizer errored here about left shifting negative numbers.

* Update license url (#332)

* Modify temporary rpath for testing in java example scripts.

* Update URL in source file Copyright headers for web copy of COPYING
file - src and test directories.

Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Sean McBride <sean@rogue-research.com>
* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Modify temporary rpath for testing in java example scripts. (#230)

* Fix undefined left shifting of negative numbers (#338)

Undefined Bahavior Sanitizer errored here about left shifting negative numbers.

* Update license url (#332)

* Modify temporary rpath for testing in java example scripts.

* Update URL in source file Copyright headers for web copy of COPYING
file - src and test directories.

* Update license url part2 (#333)

* Modify temporary rpath for testing in java example scripts.

* Update URL in source file Copyright headers for web copy of COPYING
    file - files not in src or test.

* Update URL in source file Copyright headers for web.

Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Sean McBride <sean@rogue-research.com>
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev
…417)

* Fixed HDFFV-10480 (CVE-2018-11206) and HDFFV-11159 (CVE-2018-14033)
Description
    Checked against buffer size to prevent segfault, in case of data corruption.

    + HDFFV-11159 CVE-2018-14033 Buffer over-read in H5O_layout_decode
    + HDFFV-10480 CVE-2018-11206 Buffer over-read in H5O_fill_new[/old]_decode and
        A user's patch was applied to this previously, but it is redone
        for a more correct fix, that is the check now accounted for the
        previous advance of the buffer pointer.
Platforms tested:
    Linux/64 (jelly)

* Fixed format issues with clang formatter.
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
JNI cleanup

* format alignment

* Add missing test ref file
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
JNI cleanup

* format alignment

* Add missing test ref file

* Merge #380 from develop
* HDFFV-10865 - merge from dev, HDFArray perf fix.

* Remove duplicate setting

* Whitespace changes after clang format

* Undo version 11 clang format changes

* Merge CMake changes from develop

* test testing script merge from develop

* Update supported platforms

* PR#3 merge from develop

* Merge gcc 10 diagnostics option from develop

* Merge #318 OSX changes from develop

* Merge small changes from develop

* Minor non-space formatting changes

* #386 copyright corrections for java folder

* Merges from develop

#358 patches from vtk
#361 fix header guard spelling

* Merge updates

#358 patches from vtk
#361 fix header guard spelling

* format fix

* Fix missing underscore and make H5public.h closer to dev

* Merges from develop

#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
JNI cleanup

* format alignment

* Add missing test ref file

* Merge #380 from develop

* Finish java merges from develop

* Fix java issues with tests and javadoc

* Correct use of attribute access plist

* Remove debug code

* Remove unused variable

* Change file access to read only for java tests

* Split clang format operations.

* More javadoc comments

* Remove pre-split setting

* format source
* Fixed clang-tidy readability-misleading-indentation warnings

* Reformatted src/H5Zscaleoffset.c with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
* Fixed clang-tidy readability-redundant-control-flow warnings

Just removed useless trailing return statements.

* Removed blank lines from h5diffgentest.c with clang-format v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
* Removed bad function pointer casts

In one case fixed the actual function signature to be correct.

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
@lrknox lrknox closed this Mar 10, 2021
@lrknox lrknox deleted the hdf5_merge_issue_435_v110 branch March 10, 2021 20:47
@lrknox lrknox restored the hdf5_merge_issue_435_v110 branch March 10, 2021 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.