From a4ac34d5d63e156345dea1905adde85981201a9e Mon Sep 17 00:00:00 2001 From: Lew Rossman Date: Thu, 18 Apr 2019 17:12:56 -0400 Subject: [PATCH] Updated criteria for valid object ID name --- src/project.c | 2 +- tests/test_curve.cpp | 2 +- tests/test_link.cpp | 2 +- tests/test_node.cpp | 2 +- tests/test_pattern.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/project.c b/src/project.c index f24ca25..faa3eaf 100644 --- a/src/project.c +++ b/src/project.c @@ -996,7 +996,7 @@ int namevalid(const char *name) //---------------------------------------------------------------- { size_t n = strlen(name); - if (n < 1 || n > MAXID || strpbrk(name, " \";")) return FALSE; + if (n < 1 || n > MAXID || strpbrk(name, " ;") || name[0] == '"') return FALSE; return TRUE; } diff --git a/tests/test_curve.cpp b/tests/test_curve.cpp index 6e80cd5..6712cdf 100644 --- a/tests/test_curve.cpp +++ b/tests/test_curve.cpp @@ -77,7 +77,7 @@ BOOST_FIXTURE_TEST_CASE(test_curve_id_isvalid, FixtureInitClose) error = EN_addcurve(ph, (char *)"C 2"); BOOST_REQUIRE(error == 252); - error = EN_addcurve(ph, (char *)"C\"2"); + error = EN_addcurve(ph, (char *)"\"C2"); BOOST_REQUIRE(error == 252); error = EN_addcurve(ph, (char *)"C;2"); diff --git a/tests/test_link.cpp b/tests/test_link.cpp index a352417..b853a08 100644 --- a/tests/test_link.cpp +++ b/tests/test_link.cpp @@ -70,7 +70,7 @@ BOOST_FIXTURE_TEST_CASE(test_link_id_isvalid, FixtureInitClose) error = EN_addlink(ph, (char *)"L 2", EN_PIPE, (char *)"N1", (char *)"N2", &index); BOOST_REQUIRE(error == 252); - error = EN_addlink(ph, (char *)"L\"2", EN_PIPE, (char *)"N1", (char *)"N2", &index); + error = EN_addlink(ph, (char *)"\"L2", EN_PIPE, (char *)"N1", (char *)"N2", &index); BOOST_REQUIRE(error == 252); error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2", &index); diff --git a/tests/test_node.cpp b/tests/test_node.cpp index 4912c87..d0f0cdb 100644 --- a/tests/test_node.cpp +++ b/tests/test_node.cpp @@ -57,7 +57,7 @@ BOOST_FIXTURE_TEST_CASE(test_node_validate_id, FixtureInitClose) error = EN_addnode(ph, (char *)"N 3", EN_JUNCTION, &index); BOOST_REQUIRE(error == 252); - error = EN_addnode(ph, (char *)"N\"3", EN_JUNCTION, &index); + error = EN_addnode(ph, (char *)"\"N3", EN_JUNCTION, &index); BOOST_REQUIRE(error == 252); error = EN_addnode(ph, (char *)"N;3", EN_JUNCTION, &index); diff --git a/tests/test_pattern.cpp b/tests/test_pattern.cpp index ef2eb71..13d0510 100644 --- a/tests/test_pattern.cpp +++ b/tests/test_pattern.cpp @@ -157,7 +157,7 @@ BOOST_FIXTURE_TEST_CASE(test_pat_id_isvalid, FixtureInitClose) error = EN_addpattern(ph, (char *)"P 2"); BOOST_REQUIRE(error == 252); - error = EN_addpattern(ph, (char *)"P\"2"); + error = EN_addpattern(ph, (char *)"\"P2"); BOOST_REQUIRE(error == 252); error = EN_addpattern(ph, (char *)"P;2");