hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[GIS]fix SRSWKTParser memory leak

Browse Source
This commit is contained in:
obdev
2023-08-07 07:18:34 +00:00
committed by ob-robot
parent d80f0e538c
commit c60cc58da2
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
deps/oblib/src/lib/geo/ob_srs_wkt_parser.cpp vendored
View File

@ -318,7 +318,7 @@ static int parse_coordinate_system(common::ObIAllocator &allocator, const common
char l_brac = r_brac == ')' ? '(' : '['; char l_brac = r_brac == ')' ? '(' : '[';
const char *begin = srs_str.ptr(); const char *begin = srs_str.ptr();
const char *end = begin + last + 1; // past the last const char *end = begin + last + 1; // past the last
void *buf = allocator.alloc(sizeof(SrsWktGrammar<decltype(begin), boost::spirit::ascii::space_type>)); void *buf = tmp_alloc.alloc(sizeof(SrsWktGrammar<decltype(begin), boost::spirit::ascii::space_type>));
if (OB_ISNULL(buf)) { if (OB_ISNULL(buf)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_WARN("alloc SrsWktGrammar failed", K(ret)); LOG_WARN("alloc SrsWktGrammar failed", K(ret));
@ -334,6 +334,9 @@ static int parse_coordinate_system(common::ObIAllocator &allocator, const common
ObString trailing_str(end - begin, begin); ObString trailing_str(end - begin, begin);
LOG_WARN("failed to parse coodinate sytem, has extra trailing characters", K(trailing_str)); LOG_WARN("failed to parse coodinate sytem, has extra trailing characters", K(trailing_str));
} }
if (OB_NOT_NULL(parser)) {
parser->~SrsWktGrammar<decltype(begin), boost::spirit::ascii::space_type>();
}
} }
} }
return ret; return ret;