diff options
| author | Elliott Sales de Andrade <quantum.analyst@gmail.com> | 2019-02-27 05:58:12 -0500 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-02-27 15:08:20 +0100 |
| commit | ded165a04821be519a42e2c22dc91c52affb4ab3 (patch) | |
| tree | 499677ba57e517b224dc5ad2a84d11f89c74c2ab /src | |
| parent | 92e61ee20f687377ffb9f01276a1903b63d4a641 (diff) | |
| download | PROJ-ded165a04821be519a42e2c22dc91c52affb4ab3.tar.gz PROJ-ded165a04821be519a42e2c22dc91c52affb4ab3.zip | |
Fix null dereference warning.
Counter-intuitively, this means removing checks for nullptr. The
compiler sees these checks and thinks the one remaining dereference is
missing a check. However, since pj_get_default_ctx cannot return
nullptr, these tests are redundant.
Diffstat (limited to 'src')
| -rw-r--r-- | src/open_lib.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/open_lib.cpp b/src/open_lib.cpp index 510704e9..a00d3d0e 100644 --- a/src/open_lib.cpp +++ b/src/open_lib.cpp @@ -194,10 +194,10 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode, sysname = name; /* or try to use application provided file finder */ - else if( ctx && ctx->file_finder != nullptr && (sysname = ctx->file_finder( ctx, name, ctx->file_finder_user_data )) != nullptr ) + else if( ctx->file_finder != nullptr && (sysname = ctx->file_finder( ctx, name, ctx->file_finder_user_data )) != nullptr ) ; - else if( ctx && ctx->file_finder_legacy != nullptr && (sysname = ctx->file_finder_legacy( name )) != nullptr ) + else if( ctx->file_finder_legacy != nullptr && (sysname = ctx->file_finder_legacy( name )) != nullptr ) ; /* or is environment PROJ_LIB defined */ @@ -234,7 +234,7 @@ pj_open_lib_ex(projCtx ctx, const char *name, const char *mode, } /* If none of those work and we have a search path, try it */ - if (!fid && ctx && !ctx->search_paths.empty() ) + if( !fid && !ctx->search_paths.empty() ) { for( const auto& path: ctx->search_paths ) { try { |