aboutsummaryrefslogtreecommitdiff
path: root/src/proj_internal.h
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-09-06 11:29:07 +0200
committerGitHub <noreply@github.com>2019-09-06 11:29:07 +0200
commit73ccf7e1ba2ba9e927c4eaef81f5237fb4f587b2 (patch)
tree7e6996f97af28d1fca89a47edc8bb3bb3c42a9e9 /src/proj_internal.h
parentb7ed294cff05f42ef24a212c85a10106565eef35 (diff)
parent9c38babea4650a20ec94eff9ab644f5c84c89874 (diff)
downloadPROJ-73ccf7e1ba2ba9e927c4eaef81f5237fb4f587b2.tar.gz
PROJ-73ccf7e1ba2ba9e927c4eaef81f5237fb4f587b2.zip
Merge pull request #1589 from rouault/fix_1574
PROJStringParser::createFromPROJString(): avoid potential infinite recursion (fixes #1574)
Diffstat (limited to 'src/proj_internal.h')
-rw-r--r--src/proj_internal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/proj_internal.h b/src/proj_internal.h
index 761746c1..4a126e98 100644
--- a/src/proj_internal.h
+++ b/src/proj_internal.h
@@ -706,7 +706,7 @@ struct projCtx_t {
const char* (*file_finder) (PJ_CONTEXT *, const char*, void* user_data) = nullptr;
void* file_finder_user_data = nullptr;
- std::string curStringInCreateFromPROJString{};
+ int projStringParserCreateFromPROJStringRecursionCounter = 0; // to avoid potential infinite recursion in PROJStringParser::createFromPROJString()
projCtx_t() = default;
projCtx_t(const projCtx_t&);