Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[GDAL] Move clone of dependencies to upstream repository (#3911) 

Cloning of build dependencies and patching is now done by
https://github.com/OSGeo/gdal/blob/master/gdal/fuzzers/build.sh
This commit is contained in:
Even Rouault 2020-05-31 21:30:29 +02:00 committed by GitHub
parent 4cb51d21b3
commit 476cb1b550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
projects/gdal/Dockerfile
View File

@ -22,24 +22,6 @@ RUN dpkg --add-architecture i386 && \
RUN git clone --depth 1 https://github.com/OSGeo/gdal gdal
RUN git clone --depth 1 https://github.com/OSGeo/proj.4 gdal/proj
RUN git clone --depth 1 https://github.com/curl/curl.git gdal/curl
COPY NC4_put_propattr_leak_fix.patch libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch $SRC/
RUN curl https://src.fedoraproject.org/lookaside/pkgs/netcdf/netcdf-4.4.1.1.tar.gz/9210fd5355bee868684d9b8f83064aa6/netcdf-4.4.1.1.tar.gz > gdal/netcdf-4.4.1.1.tar.gz && \
cd gdal && \
tar xzf netcdf-4.4.1.1.tar.gz && \
rm -f netcdf-4.4.1.1.tar.gz && \
mv netcdf-c-4.4.1.1 netcdf-4.4.1.1 && \
cd netcdf-4.4.1.1 && \
patch -p0 < $SRC/NC4_put_propattr_leak_fix.patch && \
patch -p0 < $SRC/libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch && \
cd ../..
RUN git clone --depth 1 https://anongit.freedesktop.org/git/poppler/poppler.git gdal/poppler
RUN cp gdal/gdal/fuzzers/build.sh $SRC/
WORKDIR gdal

16
projects/gdal/NC4_put_propattr_leak_fix.patch
View File

@ -1,16 +0,0 @@
--- libsrc4/nc4info.c.ori 2017-06-07 10:28:11.478130590 +0200
+++ libsrc4/nc4info.c 2017-06-07 10:28:29.670268763 +0200
@@ -174,11 +174,8 @@
herr = 0;
}
done:
- if(ncstat != NC_NOERR) {
- if(text != NULL) {
- free(text);
- text = NULL;
- }
+ if(text != NULL) {
+ free(text);
}
if(attid >= 0) HCHECK((H5Aclose(attid)));

46
projects/gdal/libnetcdf_fix_undefined_left_shift_in_ncx_get_size_t.patch
View File

@ -1,46 +0,0 @@
--- libsrc/ncx.m4.ori 2017-06-15 12:45:29.461345214 +0200
+++ libsrc/ncx.m4 2017-06-23 12:14:29.263652717 +0200
@@ -726,7 +726,11 @@
{
const uchar *cp = (const uchar *) xp;
+#if INT_MAX >= X_INT_MAX
+ *ip = (ix_int)((unsigned)(*cp++) << 24);
+#else
*ip = *cp++ << 24;
+#endif
#if SIZEOF_IX_INT > X_SIZEOF_INT
if(*ip & 0x80000000)
{
@@ -1883,7 +1887,7 @@
/* similar to get_ix_int */
const uchar *cp = (const uchar *) *xpp;
- *ulp = (unsigned)(*cp++ << 24);
+ *ulp = (unsigned)(*cp++) << 24;
*ulp |= (*cp++ << 16);
*ulp |= (*cp++ << 8);
*ulp |= *cp;
--- libsrc/ncx.c.ori 2017-06-15 12:38:29.769770935 +0200
+++ libsrc/ncx.c 2017-06-23 12:10:38.359973119 +0200
@@ -1031,7 +1031,11 @@
{
const uchar *cp = (const uchar *) xp;
+#if INT_MAX >= X_INT_MAX
+ *ip = (ix_int)((unsigned)(*cp++) << 24);
+#else
*ip = *cp++ << 24;
+#endif
#if SIZEOF_IX_INT > X_SIZEOF_INT
if(*ip & 0x80000000)
{
@@ -3451,7 +3455,7 @@
/* similar to get_ix_int */
const uchar *cp = (const uchar *) *xpp;
- *ulp = (unsigned)(*cp++ << 24);
+ *ulp = (unsigned)(*cp++) << 24;
*ulp |= (*cp++ << 16);
*ulp |= (*cp++ << 8);
*ulp |= *cp;