Commit 361d10a

committed

Replaced the use of "new" in find_resource

- Addresses SonarCloud issue cpp:S5025 (Memory should not be managed manually) - This function was not changed for the Windows port, but a similar change to the one suggested was done in expandEnv in the same file. - The first stream is not destructed at the exact same point it was in the previous code (but rather when the second stream replaces it on assignment to the same variable). An arbitrary scope could have been introduced to destruct the object at the same place, but it doesn't seem to be necessary and would make the code a bit strange.

1 parent 0165d37 commit 361d10aCopy full SHA for 361d10a

File tree

1 file changed

-11

lines changed

src/utils
- system.cc

1 file changed

-11

lines changed

`‎src/utils/system.cc‎`

Lines changed: 4 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,19 +98,15 @@ double cpu_seconds(void) {`
`98`	`98`
`99`	`99`	`std::string find_resource(const std::string& resource,`
`100`	`100`	`const std::string& config, std::string *err) {`
`101`		`- std::ifstream *iss;`
`102`	`101`
`103`	`102`	`err->assign("Looking at: ");`
`104`	`103`	`// Trying absolute or relative to the current dir.`
`105`		`- iss = new std::ifstream(resource, std::ios::in);`
`106`		`- if (iss->is_open()) {`
`107`		`- iss->close();`
`108`		`- delete iss;`
	`104`	`+ auto iss = std::ifstream(resource, std::ios::in);`
	`105`	`+ if (iss.is_open()) {`
`109`	`106`	`return resource;`
`110`	`107`	`} else {`
`111`	`108`	`err->append("'" + resource + "', ");`
`112`	`109`	`}`
`113`		`- delete iss;`
`114`	`110`
`115`	`111`	// What about `*' ?
`116`	`112`	`if (utils::expandEnv(resource, 0).size() > 0) {`
`@@ -121,15 +117,12 @@ std::string find_resource(const std::string& resource,`
`121`	`117`
`122`	`118`	`// Trying the same path of the configuration file.`
`123`	`119`	`std::string f = get_path(config) + "/" + resource;`
`124`		`- iss = new std::ifstream(f, std::ios::in);`
`125`		`- if (iss->is_open()) {`
`126`		`- iss->close();`
`127`		`- delete iss;`
	`120`	`+ iss = std::ifstream(f, std::ios::in);`
	`121`	`+ if (iss.is_open()) {`
`128`	`122`	`return f;`
`129`	`123`	`} else {`
`130`	`124`	`err->append("'" + f + "', ");`
`131`	`125`	`}`
`132`		`- delete iss;`
`133`	`126`
`134`	`127`	// What about `*' ?
`135`	`128`	`if (utils::expandEnv(f, 0).size() > 0) {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 361d10a

File tree

1 file changed

1 file changed

`‎src/utils/system.cc‎`

0 commit comments