From 3529081bce702ddbc7c68f677f91d3c8f5bbb897 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 26 Mar 2019 14:32:15 +0100 Subject: pj_apply_gridshift(): make it obvious there is no memory leak. Coverity CID 193535 --- src/apply_gridshift.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/apply_gridshift.cpp') diff --git a/src/apply_gridshift.cpp b/src/apply_gridshift.cpp index c7070432..d9b5286d 100644 --- a/src/apply_gridshift.cpp +++ b/src/apply_gridshift.cpp @@ -59,7 +59,10 @@ int pj_apply_gridshift( projCtx ctx, const char *nadgrids, int inverse, gridlist = pj_gridlist_from_nadgrids( ctx, nadgrids, &grid_count ); if( gridlist == nullptr || grid_count == 0 ) + { + pj_dalloc( gridlist ); return ctx->last_errno; + } ret = pj_apply_gridshift_3( ctx, gridlist, grid_count, inverse, point_count, point_offset, x, y, z ); -- cgit v1.2.3 From 095d2204f8bb05d172936aebbb1e9e44852c049f Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Fri, 29 Mar 2019 19:17:37 +0000 Subject: Remove duplicate instances of #include "proj_internal.h" Introduced by "Merge projects.h into proj_internal.h" 8ab6f683. --- src/apply_gridshift.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/apply_gridshift.cpp') diff --git a/src/apply_gridshift.cpp b/src/apply_gridshift.cpp index d9b5286d..fcd9fa01 100644 --- a/src/apply_gridshift.cpp +++ b/src/apply_gridshift.cpp @@ -34,7 +34,6 @@ #include #include -#include "proj_internal.h" #include "proj.h" #include "proj_internal.h" -- cgit v1.2.3