From 9419b42ade1f1d35a61c05f0f7ce9aab2eeff3c7 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Sun, 1 Nov 2020 13:34:32 +0100 Subject: Remove proj_api.h Removes proj_api.h from the public API. The contents of the header file has been moved to proj_internal.h verbatim and any references to proj_api.h has been changed to proj_internal.h. The documentation of proj_api.h has been removed. The only exception to this is the API migration guides which still mention the old API. Fixes #837 --- test/fuzzers/standard_fuzzer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/fuzzers/standard_fuzzer.cpp') diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp index 468e8cbb..552ac781 100644 --- a/test/fuzzers/standard_fuzzer.cpp +++ b/test/fuzzers/standard_fuzzer.cpp @@ -36,7 +36,7 @@ #define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H #include "proj.h" -#include "proj_api.h" +#include "proj_internal.h" /* Standalone build: g++ -g -std=c++11 standard_fuzzer.cpp -o standard_fuzzer -fvisibility=hidden -DSTANDALONE ../../src/.libs/libproj.a -lpthread -lsqlite3 -I../../src -I../../include -- cgit v1.2.3 From 9e50c8c0e207191c4c7bb6883f7ad485df04fc2c Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Sun, 1 Nov 2020 14:56:17 +0100 Subject: Remove ACCEPT_USE_OF_DEPRECATED_PROJ_API_H macro --- test/fuzzers/standard_fuzzer.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'test/fuzzers/standard_fuzzer.cpp') diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp index 552ac781..ab30200b 100644 --- a/test/fuzzers/standard_fuzzer.cpp +++ b/test/fuzzers/standard_fuzzer.cpp @@ -34,7 +34,6 @@ #include #include -#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H #include "proj.h" #include "proj_internal.h" -- cgit v1.2.3 From aa46197d66ce70ece382bf955326c46b13f35864 Mon Sep 17 00:00:00 2001 From: Kristian Evers Date: Sat, 14 Nov 2020 22:55:31 +0100 Subject: Weed out proj_api.h datatypes and replace them with their proj.h counterparts --- test/fuzzers/standard_fuzzer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/fuzzers/standard_fuzzer.cpp') diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp index ab30200b..d54caa79 100644 --- a/test/fuzzers/standard_fuzzer.cpp +++ b/test/fuzzers/standard_fuzzer.cpp @@ -94,13 +94,13 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) } second_newline[0] = 0; char* third_line = second_newline + 1; - projPJ pj_src = pj_init_plus(first_line); + PJ *pj_src = pj_init_plus(first_line); if( !pj_src ) { free(buf_dup); return 0; } - projPJ pj_dst = pj_init_plus(second_line); + PJ *pj_dst = pj_init_plus(second_line); if( !pj_dst ) { free(buf_dup); -- cgit v1.2.3 From e44a2acd9bc6006b66674609d39872b6291efee7 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sat, 28 Nov 2020 19:10:58 +0100 Subject: test/fuzzers: remove standard_fuzzer that used proj_api.h now removed --- test/fuzzers/standard_fuzzer.cpp | 217 --------------------------------------- 1 file changed, 217 deletions(-) delete mode 100644 test/fuzzers/standard_fuzzer.cpp (limited to 'test/fuzzers/standard_fuzzer.cpp') diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp deleted file mode 100644 index d54caa79..00000000 --- a/test/fuzzers/standard_fuzzer.cpp +++ /dev/null @@ -1,217 +0,0 @@ -/****************************************************************************** - * - * Project: proj.4 - * Purpose: Fuzzer - * Author: Even Rouault, even.rouault at spatialys.com - * - ****************************************************************************** - * Copyright (c) 2017, Even Rouault - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - ****************************************************************************/ - -#include -#include -#include -#include -#include -#include -#include - -#include "proj.h" -#include "proj_internal.h" - -/* Standalone build: -g++ -g -std=c++11 standard_fuzzer.cpp -o standard_fuzzer -fvisibility=hidden -DSTANDALONE ../../src/.libs/libproj.a -lpthread -lsqlite3 -I../../src -I../../include -*/ - -extern "C" int LLVMFuzzerInitialize(int* argc, char*** argv); -extern "C" int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len); - -int LLVMFuzzerInitialize(int* /*argc*/, char*** argv) -{ - const char* argv0 = (*argv)[0]; - char* path = pj_strdup(argv0); - char* lastslash = strrchr(path, '/'); - if( lastslash ) - { - *lastslash = '\0'; - setenv("PROJ_LIB", path, 1); - } - else - { - setenv("PROJ_LIB", ".", 1); - } - free(path); - return 0; -} - -int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) -{ - if( len > 1000 ) - { -#ifdef STANDALONE - fprintf(stderr, "Input too large\n"); -#endif - return 0; - } - - /* We expect the blob to be 3 lines: */ - /* source proj string\ndestination proj string\nx y */ - char* buf_dup = (char*)malloc(len+1); - memcpy(buf_dup, buf, len); - buf_dup[len] = 0; - char* first_line = buf_dup; - char* first_newline = strchr(first_line, '\n'); - if( !first_newline ) - { - free(buf_dup); - return 0; - } - first_newline[0] = 0; - char* second_line = first_newline + 1; - char* second_newline = strchr(second_line, '\n'); - if( !second_newline ) - { - free(buf_dup); - return 0; - } - second_newline[0] = 0; - char* third_line = second_newline + 1; - PJ *pj_src = pj_init_plus(first_line); - if( !pj_src ) - { - free(buf_dup); - return 0; - } - PJ *pj_dst = pj_init_plus(second_line); - if( !pj_dst ) - { - free(buf_dup); - pj_free(pj_src); - proj_cleanup(); - return 0; - } - double x = 0, y = 0, z = 9; - bool from_binary = false; - bool has_z = false; - if( strncmp(third_line, "BINARY_2D:", strlen("BINARY_2D:")) == 0 && - third_line - first_line + strlen("BINARY_2D:") + 2 * sizeof(double) <= len ) - { - from_binary = true; - memcpy(&x, third_line + strlen("BINARY_2D:"), sizeof(double)); - memcpy(&y, third_line + strlen("BINARY_2D:") + sizeof(double), sizeof(double)); - } - else if( strncmp(third_line, "BINARY_3D:", strlen("BINARY_3D:")) == 0 && - third_line - first_line + strlen("BINARY_3D:") + 3 * sizeof(double) <= len ) - { - from_binary = true; - has_z = true; - memcpy(&x, third_line + strlen("BINARY_3D:"), sizeof(double)); - memcpy(&y, third_line + strlen("BINARY_3D:") + sizeof(double), sizeof(double)); - memcpy(&z, third_line + strlen("BINARY_3D:") + 2 * sizeof(double), sizeof(double)); - } - else if( sscanf(third_line, "%lf %lf", &x, &y) != 2 ) - { - free(buf_dup); - pj_free(pj_src); - pj_free(pj_dst); - proj_cleanup(); - return 0; - } -#ifdef STANDALONE - fprintf(stderr, "src=%s\n", first_line); - fprintf(stderr, "dst=%s\n", second_line); - if( from_binary ) - { - if( has_z ) - fprintf(stderr, "coord (from binary)=%.18g %.18g %.18g\n", x, y, z); - else - fprintf(stderr, "coord (from binary)=%.18g %.18g\n", x, y); - } - else - fprintf(stderr, "coord=%s\n", third_line); -#endif - if( has_z ) - pj_transform( pj_src, pj_dst, 1, 0, &x, &y, &z ); - else - pj_transform( pj_src, pj_dst, 1, 0, &x, &y, NULL ); - free(buf_dup); - pj_free(pj_src); - pj_free(pj_dst); - proj_cleanup(); - return 0; -} - -#ifdef STANDALONE - -int main(int argc, char* argv[]) -{ - if( argc < 2 ) - { - const char str[] = - "+proj=longlat +datum=WGS84 +nodefs\n+proj=longlat +datum=WGS84 +nodefs\n2 49"; - int ret = LLVMFuzzerTestOneInput((const uint8_t*)(str), sizeof(str) - 1); - if( ret ) - return ret; - - const char str2[] = - "+proj=longlat +datum=WGS84 +nodefs\n+proj=longlat +datum=WGS84 +nodefs\nBINARY_2D:\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF"; - ret = LLVMFuzzerTestOneInput((const uint8_t*)(str2), sizeof(str2) - 1); - if( ret ) - return ret; - - const char str3[] = - "+proj=longlat +datum=WGS84 +nodefs\n+proj=longlat +datum=WGS84 +nodefs\nBINARY_3D:\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xFF\x00\x00\x00\x00\x00\x00\x00\x00"; - ret = LLVMFuzzerTestOneInput((const uint8_t*)(str3), sizeof(str3) - 1); - if( ret ) - return ret; - - return 0; - } - else - { - int nRet = 0; - void* buf = NULL; - int nLen = 0; - FILE* f = fopen(argv[1], "rb"); - if( !f ) - { - fprintf(stderr, "%s does not exist.\n", argv[1]); - exit(1); - } - fseek(f, 0, SEEK_END); - nLen = (int)ftell(f); - fseek(f, 0, SEEK_SET); - buf = malloc(nLen); - if( !buf ) - { - fprintf(stderr, "malloc failed.\n"); - fclose(f); - exit(1); - } - fread(buf, nLen, 1, f); - fclose(f); - nRet = LLVMFuzzerTestOneInput((const uint8_t*)(buf), nLen); - free(buf); - return nRet; - } -} - -#endif // STANDALONE -- cgit v1.2.3