From 6bde8881169cdf37256b0148e7d383232a4e305e Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 15 Mar 2019 23:52:33 +0100 Subject: Helmert: avoid potential division by zero Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=11893 Credit to OSS Fuzz --- src/transformations/helmert.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/transformations/helmert.cpp') diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp index 034f76f4..c00fad2f 100644 --- a/src/transformations/helmert.cpp +++ b/src/transformations/helmert.cpp @@ -567,14 +567,14 @@ PJ *TRANSFORMATION(helmert, 0) { if (pj_param_exists (P->params, "theta")) { P->left = PJ_IO_UNITS_PROJECTED; P->right = PJ_IO_UNITS_PROJECTED; + P->fwd = helmert_forward; + P->inv = helmert_reverse; } P->fwd4d = helmert_forward_4d; P->inv4d = helmert_reverse_4d; P->fwd3d = helmert_forward_3d; P->inv3d = helmert_reverse_3d; - P->fwd = helmert_forward; - P->inv = helmert_reverse; Q = (struct pj_opaque_helmert *)P->opaque; -- 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/transformations/helmert.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/transformations/helmert.cpp') diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp index c00fad2f..63785ea5 100644 --- a/src/transformations/helmert.cpp +++ b/src/transformations/helmert.cpp @@ -52,7 +52,6 @@ Last update: 2018-10-26 #include #include -#include "proj_internal.h" #include "proj_internal.h" #include "geocent.h" -- cgit v1.2.3