diff options
| author | Kurt Schwehr <schwehr@google.com> | 2018-03-20 11:07:10 -0700 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2018-03-20 22:45:26 +0100 |
| commit | 8e0c5db70431dea254d6de3a380fe76bccfbbb1f (patch) | |
| tree | c6b313a68cced3e7ac0a99c24a30c94b9c143eb5 /src | |
| parent | 4cc3d912e378f234f94d6b20b95fc8d21d1b8cf3 (diff) | |
| download | PROJ-8e0c5db70431dea254d6de3a380fe76bccfbbb1f.tar.gz PROJ-8e0c5db70431dea254d6de3a380fe76bccfbbb1f.zip | |
Track the header size read in pj_gridinfo_init
Fixes #875
Found with autofuzz using MSAN: use-of-uninitialized-value
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_gridinfo.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/pj_gridinfo.c b/src/pj_gridinfo.c index 664effdc..ba440de4 100644 --- a/src/pj_gridinfo.c +++ b/src/pj_gridinfo.c @@ -832,6 +832,7 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) PJ_GRIDINFO *gilist; PAFile fp; char header[160]; + size_t header_size = 0; errno = pj_errno = 0; ctx->last_errno = 0; @@ -878,10 +879,14 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) /* -------------------------------------------------------------------- */ /* Load a header, to determine the file type. */ /* -------------------------------------------------------------------- */ - if( pj_ctx_fread( ctx, header, sizeof(header), 1, fp ) != 1 ) + if( (header_size = pj_ctx_fread( ctx, header, 1, + sizeof(header), fp ) ) != sizeof(header) ) { /* some files may be smaller that sizeof(header), eg 160, so */ ctx->last_errno = 0; /* don't treat as a persistent error */ + pj_log( ctx, PJ_LOG_DEBUG_MAJOR, + "pj_gridinfo_init: short header read of %d bytes", + (int)header_size ); } pj_ctx_fseek( ctx, fp, SEEK_SET, 0 ); @@ -889,14 +894,16 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) /* -------------------------------------------------------------------- */ /* Determine file type. */ /* -------------------------------------------------------------------- */ - if( strncmp(header + 0, "HEADER", 6) == 0 + if( header_size >= 144 + 16 + && strncmp(header + 0, "HEADER", 6) == 0 && strncmp(header + 96, "W GRID", 6) == 0 && strncmp(header + 144, "TO NAD83 ", 16) == 0 ) { pj_gridinfo_init_ntv1( ctx, fp, gilist ); } - else if( strncmp(header + 0, "NUM_OREC", 8) == 0 + else if( header_size >= 48 + 7 + && strncmp(header + 0, "NUM_OREC", 8) == 0 && strncmp(header + 48, "GS_TYPE", 7) == 0 ) { pj_gridinfo_init_ntv2( ctx, fp, gilist ); @@ -909,7 +916,7 @@ PJ_GRIDINFO *pj_gridinfo_init( projCtx ctx, const char *gridname ) pj_gridinfo_init_gtx( ctx, fp, gilist ); } - else if( strncmp(header + 0,"CTABLE V2",9) == 0 ) + else if( header_size >= 9 && strncmp(header + 0,"CTABLE V2",9) == 0 ) { struct CTABLE *ct = nad_ctable2_init( ctx, fp ); |