Commit Graph

3933 Commits

Author SHA1 Message Date
Dennis Heimbigner
86fc8745dc merge master and resolve conflicts 2017-08-12 15:50:31 -06:00
Ward Fisher
a6e3f577f2 Merge pull request #450 from rouault/fix_nc4_check_name_buffer_overflow
Fix stack buffer overflow in nc4_check_name()
2017-08-08 13:15:42 -06:00
Ward Fisher
f6ac978f25 Merge branch 'master' into fix_nc4_check_name_buffer_overflow 2017-08-08 11:22:06 -06:00
Ward Fisher
99625c0c9f Merge branch 'v4.5.0-release-branch' 2017-08-07 14:03:17 -06:00
Ward Fisher
8ab714f1d8 Corrected a missing endif. 2017-08-07 10:23:15 -06:00
Ward Fisher
a3f2dcff3c Corrected release date for rc2 2017-08-07 10:13:27 -06:00
Ward Fisher
05d3d7e9f5 Merge remote-tracking branch 'origin/d4tempfile.dmh' into v4.5.0-release-branch 2017-08-07 10:12:36 -06:00
Dennis Heimbigner
4d8fbbf501 If DAP (2 or 4) is enabled, but diskless is disabled, then the
dap code will create a real temporary file in which to store the
converted metadata for the DAP .dds or .dmr.

It was assumed that the nc_close code would reclaim the
temporary file. For DAP2, reclamation occurs in the ncio
code. For DAP4, it was assumed that the libsrc4 code would do
the reclamation, but for whatever reason, this is not happening.
Thus, in this situation, a temporary file is left in the file
system. Aside from being irritating to users, this screws up
'make distcheck'.

So the DAP4 code is fixed to ensure that the temporary file is
properly reclaimed independent of the libsrc4 code.
2017-08-05 22:41:31 -06:00
Ward Fisher
0a02f0cac7 Updated release notes for 4.5.0-rc2 2017-08-03 17:01:16 -06:00
Even Rouault
1989ddc252 Fix stack buffer overflow in nc4_check_name()
nc4_check_name() checks that the provided string doesn't exceed NC_MAX_NAME,
but fails to do so after calling nc_utf8_normalize(). This extra check is
needed since a caller of nc4_check_name(), like NC4_def_dim, allocates
norm_name as char norm_name[NC_MAX_NAME + 1]

Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=2840
Credit to OSS-Fuzz
2017-08-02 21:57:36 +02:00
Ward Fisher
716f76c322 Merge remote-tracking branch 'origin/issue435.dmh' into v4.5.0-release-branch 2017-07-28 15:24:16 -06:00
Ward Fisher
eea1cecaa9 Merge branch 'multi-pull' into v4.5.0-release-branch 2017-07-27 12:48:59 -06:00
Ward Fisher
9e7a902dcf Merge branch 'issue435.dmh' into multi-pull 2017-07-27 12:20:11 -06:00
Ward Fisher
8700f1bfd4 Merge branch 'v4.5.0-release-branch' into issue435.dmh 2017-07-27 12:17:16 -06:00
Ward Fisher
c88bc64bfa Merge remote-tracking branch 'origin/fieldmap.dmh' into multi-pull 2017-07-27 12:16:37 -06:00
Ward Fisher
44b82e8f1d Merge pull request #439 from Unidata/winpath.again.dmh
Add additional path name conversion checks
2017-07-26 15:45:34 -06:00
Ward Fisher
3e166fd26a Accomodating Windows winsock issue. 2017-07-26 13:40:03 -06:00
Ward Fisher
30711ccb20 Updated shell scripts to accomodate windows style carriage returns. 2017-07-26 13:35:27 -06:00
Dennis Heimbigner
7f31358ee2 As a result of helping a user trying to build the filter test on
a linux variant system, I made some changes to (one hopes)
incorporate some improvements in documenting and building this test.
2017-07-25 15:57:00 -06:00
Dennis Heimbigner
07d67e737a 1. Cleaned up some holdover debug code.
2. modified ncdap_tests to remove <cr>
   from generated output before comparison
   to expected. This is a hack because
   my other attempts to force windows to use
   binary mode have not worked.
2017-07-25 14:58:29 -06:00
Dennis Heimbigner
6a1876602b Merge branch 'v4.5.0-release-branch' into winpath.again.dmh 2017-07-25 13:16:33 -06:00
Dennis Heimbigner
5e96b0c42e Force binary mode in oc2/ocread.c 2017-07-18 12:44:39 -06:00
Dennis Heimbigner
6505ff6880 Force file opens to default to binary mode for cygwin and windows 2017-07-17 18:58:45 -06:00
Dennis Heimbigner
88b3d20e4e turn debug on 2017-07-16 13:13:10 -06:00
Dennis Heimbigner
967187f1a5 turn of extra debug 2017-07-15 20:21:24 -06:00
Dennis Heimbigner
d08a028a37 use srcdir instead of pws 2017-07-15 19:16:45 -06:00
Dennis Heimbigner
f5b597c3f3 force WINPATH 2017-07-15 18:43:22 -06:00
Dennis Heimbigner
86c8898bdd add tst_ber.sh to extra dist 2017-07-15 15:39:34 -06:00
Dennis Heimbigner
aa74d73da0 update file permissions on test_ber 2017-07-15 14:45:57 -06:00
Dennis Heimbigner
fb0a679c2a verbose output 2017-07-15 14:32:21 -06:00
Dennis Heimbigner
75c551f53d bug fix in dwinpath 2017-07-15 13:03:35 -06:00
Dennis Heimbigner
1b138ecf64 more debug info 2017-07-14 19:37:35 -06:00
Dennis Heimbigner
081963ef8a forgot to add to cmake 2017-07-14 16:44:50 -06:00
Dennis Heimbigner
5117cc1052 Attempt to get more debug info out of ber test 2017-07-14 16:38:50 -06:00
Dennis Heimbigner
0efc4e5023 Turn off debug noise 2017-07-14 15:32:17 -06:00
Ward Fisher
401fcc572a Updated release notes in support of https://github.com/Unidata/netcdf-c/issues/385 2017-07-14 10:43:19 -06:00
Ward Fisher
97b8e9d4cb Corrected the way large file support was implemented in cmakelists.txt, not sure why it was like that to start with. In support of https://github.com/Unidata/netcdf-c/issues/385 2017-07-13 17:15:56 -06:00
Dennis Heimbigner
eee41eea55 turn off debugging 2017-07-13 11:45:52 -06:00
Ward Fisher
d18378c69b Merge pull request #409 from Unidata/DennisHeimbigner-patch-1
Update install.md
2017-07-13 10:47:22 -06:00
Dennis Heimbigner
715a6fe5eb The files libdispatch/dwinpath.c and include/ncwinpath.h
were added to provide a path name converter from e.g. cygwin
paths to e.g. windows paths. This is necessary because
the shell scripts may produce cygwin paths, but the code
may have been compiled with Visual Studio. Similar issues
arise with Mingw.

At appropriate places, and if using Visual Studio or Mingw,
I added calls to the path conversion code.
Apparently I forgot to find all the places where this
conversion was needed. So this pr does the following:
1. Push the calls to the converter to the various libXXX
   directories and out of libdispatch/dfile.c.
2. Add conversion calls to other parts of the code like oc2.

I also turns out that conversion code in dapcvt.c
had a bug when handling DAP Byte type under visual studio.

Notes:
1. there may still be places I missed that need to do path conversion.
2. need to make sure that calls to e.g. H5open also use converted path.
2017-07-13 10:40:07 -06:00
Ward Fisher
74448c6c2d Merge branch 'master' into DennisHeimbigner-patch-1 2017-07-06 13:44:25 -06:00
Ward Fisher
e56e50413f Merge branch 'master' into fieldmap.dmh 2017-07-06 13:42:31 -06:00
Ward Fisher
e4f81a1611 Fixed issue on 32-bit systems. 2017-07-05 14:57:12 -06:00
Dennis Heimbigner
d1544b8ad9 Error in ncuri in handling user:pwd@ in url 2017-07-05 14:39:23 -06:00
Dennis Heimbigner
9719fbfbad re: hithub issue https://github.com/Unidata/netcdf-c/issues/435
Some temporary files are being left in a tempdir (e.g. /tmp
under *nix*).

The situation is described tersely in
netcdf-c/docs/auth.html#REDIR Basically, when a url is used that
requires redirection, a physical cookiejar file is required
to exist in the file system in order for this to work.

Since it was difficult to figure out when redirection was
being used (it was internal to libcurl) I needed to be prepared for that
eventuality. The result was that I always created a cookiejar file if one
was not specified in the rc file. This actually occurs in two places:
one inside oc2 and one inside libdap4.

The solution was two-fold:
1. do not use a cookiejar directory -- create cookiejar file directly
2. ensure that all cookiejar related files are reclaimed by nc_close().
Note that if nc_close (or nc_abort) is not called for whatever reason,
then reclamation will not occur.
2017-07-05 10:03:48 -06:00
Ward Fisher
fd2c575597 Updated release notes. 2017-06-29 11:16:02 -06:00
Ward Fisher
d73c501a17 Merge remote-tracking branch 'origin/issue310.dmh' into gh434 2017-06-29 10:27:36 -06:00
Ward Fisher
ed4dfb4402 Testing something with the pure h5 tests. 2017-06-28 16:51:29 -06:00
Dennis Heimbigner
0ae22325f3 Forgot to add test files to github 2017-06-28 15:08:20 -06:00
Dennis Heimbigner
dc9e31df68 Fix for github issue https://github.com/Unidata/netcdf-c/issues/310.
The problem was that for opendap, it is possible to use keywords
as identifiers
 when there is no ambiguity. However, the DAP2
parser lost the case of the identifier used the lower case version.
Fix is to use the actual text of the symbol when it is used as an identifier.
Also added a test case for this (kwcase.*).

Additionally cleaned up some misc. dap2 testing problems.
1. ncdap_test/tst_ncdap3.sh was using an empty test set.
   restored the testing of datasets.
2. as a consequence of #1, some tests needed to be updated with minor
   tweeks.
3. fix dapmerge to handle multiple DODS_EXTRAS attributes.
4. modify buildattribute to suppress nul characters and terminate
   the name at the first nul.
5. clean up various test scripts to remove residual, unused
   references to obsolete netcdf-4 translation.
6. export e.g. NCDUMP from test_common.in so that non-top-level
   shell scripts can access it.
2017-06-28 13:51:01 -06:00