Commit Graph

21429 Commits

Author SHA1 Message Date
Dana Robinson
bd685b0e80 Fixed missing parens in VFDs 2020-08-03 15:47:46 -07:00
Dana Robinson
6e71992502 Minor change to header comments in file locking C++ changes. 2020-08-03 09:35:17 -07:00
Dana Robinson
bc1bed2c55 Squash merge of file locking fixes 2020-08-03 09:11:27 -07:00
Dana Robinson
33c0016eb6 Merge pull request #2727 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit 'b9de162eae800a9459f0f1f07d2b043f73f8a907':
  Minor normalizations with 1.12 branch
  Fixed bad parens in H5trace.c
2020-08-02 18:22:54 -05:00
Dana Robinson
b9de162eae Minor normalizations with 1.12 branch 2020-08-01 10:26:22 -07:00
Dana Robinson
4486905131 Merge branch 'develop' into develop_minor 2020-08-01 10:26:11 -07:00
Dana Robinson
66ce984dee Merge pull request #2723 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit '08dca47475f41e93348cf0c2ea708e787c232014':
  Minor normalizations with hdf5_1_10
2020-08-01 11:36:59 -05:00
Dana Robinson
64ffb37ff6 Fixed bad parens in H5trace.c 2020-07-31 12:23:57 -07:00
Dana Robinson
08dca47475 Minor normalizations with hdf5_1_10 2020-07-31 11:40:29 -07:00
Allen Byrne
5007f82225 Merge pull request #2722 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'fc57490e02835ddfce644135e93e893f77b379d3':
  Mingw copy disabled
2020-07-31 13:26:17 -05:00
David Young
651facc144 Use PRIu32 and "zu" formats. Delete some casts from size_t. 2020-07-31 10:34:27 -05:00
Allen Byrne
fc57490e02 Mingw copy disabled 2020-07-31 07:50:11 -05:00
Dana Robinson
50f404c887 Merge pull request #2720 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit 'c8ba30d965f0342e5725a11cb562dfb22c8a8d24':
  Minor normalization with 1.10 branch
2020-07-30 20:16:17 -05:00
David Young
0bb87534a6 Merge remote-tracking branch 'hdffv/develop' into rebased-fprintf-experiment 2020-07-30 18:15:09 -05:00
David Young
3e91eeb270 I'm taking a guess that this code intended to point the 2-digit wide
hexadecimal octet values, not 2 character-wide pointers to the bytes.  The %02p
format, which is a GNU-ism, disagreed with GCC 8.3.0 and the option flags we
use.
2020-07-30 18:01:29 -05:00
David Young
ea21b3f89f %08p is not portable, it's a GNU-ism. Use %8p, instead. Squashes a GCC error. 2020-07-30 17:54:04 -05:00
David Young
ddd5e4a6c3 Add format string macros PRI[doxX]HID for hid_t and use PRIdHID. 2020-07-30 17:53:18 -05:00
David Young
36befb6bfe Use HDva_copy() and introduce a bunch of compatbility format-string constants
for uppercase hexadecimal strings, `PRIX...`.  Should fix the VS2010 errors
that Allen mentioned:

H5system.obj : error LNK2019: unresolved external symbol va_copy referenced in  function HDvasprintf                                                            [C:\autotest\hdf5trunk-StdShar-code-vs10\build\ctest\hdfbld\src\hdf5-shared.vcxproj]                                                                            2                                                                               ..\..\..\hdfsrc\test\h5test.c(2103): error C2146: syntax error : missing ')'    before identifier 'PRIX64'                                                      [C:\autotest\hdf5trunk-StdShar-code-vs10\build\ctest\hdfbld\test\hdf5_test-static.vcxproj]
2020-07-30 17:32:03 -05:00
Dana Robinson
c8ba30d965 Merge branch 'develop' into develop_minor 2020-07-30 15:23:54 -07:00
Allen Byrne
88aa0d5c76 Merge pull request #2718 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'ff4a9d0ec2e85cf15f769006e92e756a79869ab8':
  Warnings reduction in tools
2020-07-30 11:46:39 -05:00
Allen Byrne
ff4a9d0ec2 Warnings reduction in tools 2020-07-30 11:26:14 -05:00
Allen Byrne
2ece66e999 Merge pull request #2716 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6a1cf090c6a2f970084c714a2f75a31d68a0a6a8':
  Correct reference file
  Correct h5diff filenames
2020-07-29 15:40:05 -05:00
Allen Byrne
6a1cf090c6 Correct reference file 2020-07-29 12:56:03 -05:00
Allen Byrne
1f7fa50137 Correct h5diff filenames 2020-07-29 08:24:30 -05:00
Binh-Minh Ribler
cf4e78b3c9 Merge pull request #2711 in HDFFV/hdf5 from bmr-HDFFV-11120 to develop
Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)

* commit '707e30c6be1954c0027374124207e46caae68cbc':
  Fixed typos in error messages.
  Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)
2020-07-28 19:08:19 -05:00
Jerome Soumagne
ef6db167a8 H5R: fix encoding of references that are part of compound types
Add corresponding test and some debug information
2020-07-28 16:36:19 -05:00
Binh-Minh Ribler
707e30c6be Fixed typos in error messages. 2020-07-28 12:20:13 -05:00
Dana Robinson
b201a78b33 Merge pull request #2714 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5s_set_extent_none to develop
* commit 'e4603ff8a171e82de6373ba6eddcf59d5eeab5aa':
  Updated the Java tests to deal with H5Sset_extent_none changes
  Fixed additional typos in tselect.c comments.
  Fixes typo in tselect.c
  Updates H5Sset_extent_none() to set H5S_NULL
2020-07-28 11:29:04 -05:00
Dana Robinson
e4603ff8a1 Updated the Java tests to deal with H5Sset_extent_none changes 2020-07-28 08:28:38 -07:00
Allen Byrne
10e59f6ba4 Merge pull request #2697 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '5857bb817019b8513f796c9564de3f1845f9a44a':
  Only one line needed to compare
  Revert err file
  revert error-stack enable
  Add release notes for tools
  add test file ext
  Correct file name in test
  Tools refactor
2020-07-28 07:13:18 -05:00
Dana Robinson
c78326eb92 Fixed additional typos in tselect.c comments. 2020-07-27 17:40:25 -07:00
Dana Robinson
dbba42c306 Fixes typo in tselect.c 2020-07-27 17:38:41 -07:00
Dana Robinson
91f5320ff0 Updates H5Sset_extent_none() to set H5S_NULL
The API call used to set the internal H5S_NO_CLASS value which
produced errors when such a dataspace was passed to many other API
calls.

Fixes HDFFV-11027
2020-07-27 17:32:01 -07:00
Allen Byrne
5857bb8170 Only one line needed to compare 2020-07-27 16:15:50 -05:00
Allen Byrne
799f2891c2 Revert err file 2020-07-27 15:47:10 -05:00
Dana Robinson
6e740457cc Minor normalization with 1.10 branch 2020-07-27 11:09:05 -07:00
Binh-Minh Ribler
303be6d7de Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into bmr-HDFFV-11120 2020-07-22 16:15:47 -05:00
Binh-Minh Ribler
88e458ac43 Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)
Description:
    When a buffer overflow occurred because a name length was corrupted
    and became very large, h5dump produced a segfault on one file and a
    memcpy parameter overlap on another file.  This commit added checks
    that detect a read pass the end of the buffer to prevent these error
    conditions.
Platforms tested:
    Linux/64 (jelly)
    SunOS 5.11 (emu)
2020-07-22 16:13:26 -05:00
Allen Byrne
e0b86594c2 revert error-stack enable 2020-07-20 16:46:49 -05:00
Allen Byrne
c0bc9d0e60 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '74e09473c825610d203565e5ed9deb156256d6ea':
  Minor normalization with 1.10.
2020-07-20 14:08:55 -05:00
Dana Robinson
74e09473c8 Merge pull request #2703 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit '242459231b40a88741cbc85df4272914b5d8bed3':
  Minor normalization with 1.10.
2020-07-20 14:04:41 -05:00
Dana Robinson
242459231b Minor normalization with 1.10. 2020-07-20 11:50:10 -07:00
Allen Byrne
bae8107621 Add release notes for tools 2020-07-20 10:26:17 -05:00
Allen Byrne
a498b4ee79 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '9d3ea366d4bf3278e8260f4d5cdcc88cb4b61c56':
  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
2020-07-17 14:39:25 -05:00
Vailin Choi
9d3ea366d4 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 '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
2020-07-17 14:27:12 -05:00
Allen Byrne
a2f2887675 add test file ext 2020-07-17 13:22:26 -05:00
Allen Byrne
93c3d7b2f3 Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'e36047b9b9839d1fd0b4009b7066b8b50b95bc6d':
  Minor normalization with 1.10
2020-07-17 10:40:49 -05:00
Dana Robinson
e36047b9b9 Merge pull request #2700 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor to develop
* commit '6388a6750ff1dc476b8631d26cd1742730df9fe8':
  Minor normalization with 1.10
2020-07-17 10:23:24 -05:00
Dana Robinson
6388a6750f Minor normalization with 1.10 2020-07-17 05:17:48 -07:00
vchoi
3023b34272 Update MANIFEST.
Add new test to Cmake.
2020-07-16 16:40:11 -05:00