summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' into file_locking_squash_2Dana Robinson2020-08-0630-851/+880
|\
| * Merge pull request #2737 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-08-063-34/+43
| |\ | | | | | | | | | | | | | | | | | | to develop * commit '65e92e1d56dd2e04ebe7b7713fee9e9e38cd8849': Warning fixes in tools and h5test.c
| | * Warning fixes in tools and h5test.cDana Robinson2020-08-063-34/+43
| |/
| * Merge pull request #2733 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-08-0410-508/+529
| |\ | | | | | | | | | | | | | | | | | | to develop * commit 'be02566f49f953bc80c5b5018871138e201ea633': Fixes indenting in tools test scripts
| | * Fixes indenting in tools test scriptsDana Robinson2020-08-0410-508/+529
| |/
| * Merge pull request #2727 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-08-0217-309/+308
| |\ | | | | | | | | | | | | | | | | | | | | | to develop * commit 'b9de162eae800a9459f0f1f07d2b043f73f8a907': Minor normalizations with 1.12 branch Fixed bad parens in H5trace.c
| | * Minor normalizations with 1.12 branchDana Robinson2020-08-0116-266/+265
| | |
| | * Merge branch 'develop' into develop_minorDana Robinson2020-08-012-5/+8
| | |\ | | |/ | |/|
| | * Fixed bad parens in H5trace.cDana Robinson2020-07-311-43/+43
| | |
* | | Updated the file locking Fortran property list wrappers and addedDana Robinson2020-08-045-88/+86
| | | | | | | | | | | | a test.
* | | Fixed missing parens in VFDsDana Robinson2020-08-035-5/+5
| | |
* | | Minor change to header comments in file locking C++ changes.Dana Robinson2020-08-031-2/+2
| | |
* | | Squash merge of file locking fixesDana Robinson2020-08-0339-309/+1458
|/ /
* | Merge pull request #2723 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-08-019-414/+331
|\ \ | |/ | | | | | | | | | | to develop * commit '08dca47475f41e93348cf0c2ea708e787c232014': Minor normalizations with hdf5_1_10
| * Minor normalizations with hdf5_1_10Dana Robinson2020-07-319-414/+331
| |
* | Merge pull request #2722 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-312-5/+8
|\ \ | |/ |/| | | | | * commit 'fc57490e02835ddfce644135e93e893f77b379d3': Mingw copy disabled
| * Mingw copy disabledAllen Byrne2020-07-312-5/+8
|/
* Merge pull request #2720 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-07-3111-312/+220
|\ | | | | | | | | | | | | to develop * commit 'c8ba30d965f0342e5725a11cb562dfb22c8a8d24': Minor normalization with 1.10 branch
| * Merge branch 'develop' into develop_minorDana Robinson2020-07-3071-4714/+4091
| |\ | |/ |/|
* | Merge pull request #2718 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-3010-134/+126
|\ \ | | | | | | | | | | | | * commit 'ff4a9d0ec2e85cf15f769006e92e756a79869ab8': Warnings reduction in tools
| * | Warnings reduction in toolsAllen Byrne2020-07-3010-134/+126
|/ /
* | Merge pull request #2716 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-299-27/+27
|\ \ | | | | | | | | | | | | | | | * commit '6a1cf090c6a2f970084c714a2f75a31d68a0a6a8': Correct reference file Correct h5diff filenames
| * | Correct reference fileAllen Byrne2020-07-291-2/+2
| | |
| * | Correct h5diff filenamesAllen Byrne2020-07-299-29/+29
|/ /
* | Merge pull request #2711 in HDFFV/hdf5 from bmr-HDFFV-11120 to developBinh-Minh Ribler2020-07-292-1/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | 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)
| * | Fixed typos in error messages.Binh-Minh Ribler2020-07-281-3/+3
| | |
| * | Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into ↵Binh-Minh Ribler2020-07-2223-236/+162
| |\ \ | | | | | | | | | | | | bmr-HDFFV-11120
| * | | Fix HDFFV-11120 and HDFFV-11121 (CVE-2018-13870 and CVE-2018-13869)Binh-Minh Ribler2020-07-222-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | Merge pull request #2714 in HDFFV/hdf5 from ↵Dana Robinson2020-07-284-5/+99
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~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
| * | | | Updated the Java tests to deal with H5Sset_extent_none changesDana Robinson2020-07-281-1/+1
| | | | |
| * | | | Fixed additional typos in tselect.c comments.Dana Robinson2020-07-281-2/+2
| | | | |
| * | | | Fixes typo in tselect.cDana Robinson2020-07-281-1/+1
| | | | |
| * | | | Updates H5Sset_extent_none() to set H5S_NULLDana Robinson2020-07-283-4/+98
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #2697 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to developAllen Byrne2020-07-2864-4679/+3942
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | Only one line needed to compareAllen Byrne2020-07-271-0/+1
| | | |
| * | | Revert err fileAllen Byrne2020-07-271-8/+0
| | | |
| * | | revert error-stack enableAllen Byrne2020-07-201-1/+1
| | | |
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-2023-236/+162
| |\ \ \ | |/ / / |/| | | | | | | | | | | * commit '74e09473c825610d203565e5ed9deb156256d6ea': Minor normalization with 1.10.
| * | | Add release notes for toolsAllen Byrne2020-07-201-2/+38
| | | |
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-178-1/+200
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * 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
| * | | add test file extAllen Byrne2020-07-172-4/+4
| | | |
| * | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-174-31/+30
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'e36047b9b9839d1fd0b4009b7066b8b50b95bc6d': Minor normalization with 1.10
| * \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-164-25/+336
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '58d37c2295044ad1a201d6671cdd67ae380b84f8': H5R: fix type conversion of references within vlen type
| * | | | | Correct file name in testAllen Byrne2020-07-161-1/+1
| | | | | |
| * | | | | Tools refactorAllen Byrne2020-07-1560-4667/+3901
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move error_stack setup to tools library Add structure for h5dump properties Eliminate duplicated h5diff functions Use properties structure in place of argument lists.
| * | | | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-142-29/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '806f5b5b2a280072f62f58c48e93acdc84f2b3ae': Removed POSIX #defines from configure on Solaris. Fallback to older time functions in new timer code.
| * \ \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-117-5/+94
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b480d0a38b1e265c55c74262bf384d255a33e07b': Remove path to szip header file from AM_CPPFLAGS when configure check of libsz fails. Fix for HDFFV-10830. HDFFV-11116 Add option for install location of Fortran MOD files
| * \ \ \ \ \ \ Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)Allen Byrne2020-07-0921-1074/+1055
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5da9b1befeb81aa9f4d97df3ec606f801807420': Minor changes from normalization with 1.10
| | | | | | | | * Minor normalization with 1.10 branchDana Robinson2020-07-2711-312/+220
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge pull request #2703 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor ↵Dana Robinson2020-07-2023-236/+162
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to develop * commit '242459231b40a88741cbc85df4272914b5d8bed3': Minor normalization with 1.10.
generated by cgit v0.12 at 2024-08-20 04:40:23 (GMT)