AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Find out who is calling StringReplace, or if the call is from strutil

Browse Source 
itself.
This commit is contained in:
Jorg Brown 2022-06-18 14:54:10 -07:00
parent dc7f4debbc
commit e9668e41be
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/google/protobuf/stubs/strutil.cc
View File

@ -43,6 +43,8 @@
#include <google/protobuf/stubs/logging.h>
#include <google/protobuf/stubs/stl_util.h>
#undef StringReplace
#ifdef _WIN32
// MSVC has only _snprintf, not snprintf.
//
@ -134,7 +136,7 @@ void StripWhitespace(std::string *str) {
uintptr_t((dest).size()))
void StringReplace(StringPiece s, StringPiece oldsub, StringPiece newsub,
bool replace_all, std::string *res) {
bool replace_all, std::string *res, char *filename, int linenum) {
if (oldsub.empty()) {
DONOTCHECKIN_GOOGLE_DCHECK_NO_OVERLAP(*res, s);
StrAppend(res, s); // if empty, append the given string.
@ -154,7 +156,8 @@ void StringReplace(StringPiece s, StringPiece oldsub, StringPiece newsub,
StrAppend(res, newsub);
start_pos = pos + oldsub.size(); // start searching again after the "old"
} while (replace_all);
DONOTCHECKIN_GOOGLE_DCHECK_NO_OVERLAP(*res, s) << " res=" << *res << " s=" << s;
DONOTCHECKIN_GOOGLE_DCHECK_NO_OVERLAP(*res, s)
<< " file=" << (filename ? filename : "") << " line=" << linenum;
StrAppend(res, s.substr(start_pos, s.length() - start_pos));
}
@ -167,10 +170,10 @@ void StringReplace(StringPiece s, StringPiece oldsub, StringPiece newsub,
// happened or not.
// ----------------------------------------------------------------------
std::string StringReplace(StringPiece s, StringPiece oldsub, StringPiece newsub,
bool replace_all) {
std::string StringReplaceImpl(StringPiece s, StringPiece oldsub, StringPiece newsub,
bool replace_all, char *filename, int linenum) {
std::string ret;
StringReplace(s, oldsub, newsub, replace_all, &ret);
StringReplace(s, oldsub, newsub, replace_all, &ret, filename, linenum);
return ret;
}

5
src/google/protobuf/stubs/strutil.h
View File

@ -204,8 +204,9 @@ inline std::string ToUpper(StringPiece s) {
// happened or not.
// ----------------------------------------------------------------------
PROTOBUF_EXPORT std::string StringReplace(StringPiece s, StringPiece oldsub,
StringPiece newsub, bool replace_all);
PROTOBUF_EXPORT std::string StringReplaceImpl(StringPiece s, StringPiece oldsub,
StringPiece newsub, bool replace_all, char *filename = nullptr, int linenum = 0);
#define StringReplace(s,o,n,all) StringReplaceImpl(s,o,n,all,__FILE__, __LINE__);
// ----------------------------------------------------------------------
// SplitStringUsing()