debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dtinfo/TextParser.C: coverity CID 89054; mem corruption

Browse Source
This commit is contained in:
Jon Trulson
2018-03-31 14:07:28 -06:00
parent 73b6311a83
commit 8862366f00
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.C
View File

@@ -252,7 +252,7 @@ StringParser::brute_force(const char* text_in, int n_of_pats,
}
char *
const char *
StringParser::project_textrun(const char* org_textrun)
{
if (org_textrun == NULL || *org_textrun == '\0')
@@ -325,11 +325,11 @@ StringParser::project_textrun(const char* org_textrun)
ret_text << off << '\t' << len << '\n' << '\0';
string rettstr = ret_text.str();
return (char *)rettstr.c_str();
static string rettstr = ret_text.str();
return rettstr.c_str();
}
char *
const char *
StringParser::hilite(const char* text, int n, const char* pats)
{
char* textrun = brute_force(text, n, pats);
@@ -337,9 +337,10 @@ StringParser::hilite(const char* text, int n, const char* pats)
if (textrun == NULL)
return NULL;
char* prjed_textrun = project_textrun(textrun);
delete[] textrun;
const char* prjed_textrun = project_textrun(textrun);
return prjed_textrun;
}

4
cde/programs/dtinfo/dtinfo/src/UAS/DtSR/TextParser.hh
View File

@@ -9,13 +9,13 @@ class StringParser {
public:
static char *
static const char *
hilite(const char* text, int n, const char* pats);
static char *
brute_force(const char* text, int, const char* pats, int sensitive = 0);
static char *
static const char *
project_textrun(const char *);
};