JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Updated criteria for valid object ID name

Browse Source
This commit is contained in:
Lew Rossman
2019-04-18 17:12:56 -04:00
parent 6b0e421a39
commit a4ac34d5d6
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/project.c
View File

@@ -996,7 +996,7 @@ int namevalid(const char *name)
//---------------------------------------------------------------- //----------------------------------------------------------------
{ {
size_t n = strlen(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; return TRUE;
} }

2
tests/test_curve.cpp
View File

@@ -77,7 +77,7 @@ BOOST_FIXTURE_TEST_CASE(test_curve_id_isvalid, FixtureInitClose)
error = EN_addcurve(ph, (char *)"C 2"); error = EN_addcurve(ph, (char *)"C 2");
BOOST_REQUIRE(error == 252); BOOST_REQUIRE(error == 252);
error = EN_addcurve(ph, (char *)"C\"2"); error = EN_addcurve(ph, (char *)"\"C2");
BOOST_REQUIRE(error == 252); BOOST_REQUIRE(error == 252);
error = EN_addcurve(ph, (char *)"C;2"); error = EN_addcurve(ph, (char *)"C;2");

2
tests/test_link.cpp
View File

@@ -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); error = EN_addlink(ph, (char *)"L 2", EN_PIPE, (char *)"N1", (char *)"N2", &index);
BOOST_REQUIRE(error == 252); 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); BOOST_REQUIRE(error == 252);
error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2", &index); error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2", &index);

2
tests/test_node.cpp
View File

@@ -57,7 +57,7 @@ BOOST_FIXTURE_TEST_CASE(test_node_validate_id, FixtureInitClose)
error = EN_addnode(ph, (char *)"N 3", EN_JUNCTION, &index); error = EN_addnode(ph, (char *)"N 3", EN_JUNCTION, &index);
BOOST_REQUIRE(error == 252); 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); BOOST_REQUIRE(error == 252);
error = EN_addnode(ph, (char *)"N;3", EN_JUNCTION, &index); error = EN_addnode(ph, (char *)"N;3", EN_JUNCTION, &index);

2
tests/test_pattern.cpp
View File

@@ -157,7 +157,7 @@ BOOST_FIXTURE_TEST_CASE(test_pat_id_isvalid, FixtureInitClose)
error = EN_addpattern(ph, (char *)"P 2"); error = EN_addpattern(ph, (char *)"P 2");
BOOST_REQUIRE(error == 252); BOOST_REQUIRE(error == 252);
error = EN_addpattern(ph, (char *)"P\"2"); error = EN_addpattern(ph, (char *)"\"P2");
BOOST_REQUIRE(error == 252); BOOST_REQUIRE(error == 252);
error = EN_addpattern(ph, (char *)"P;2"); error = EN_addpattern(ph, (char *)"P;2");