luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #551 from aesophor/replace-sprintf

Browse Source 
Replace sprintf() with snprintf() (#536)
This commit is contained in:
Sergiu Deitsch 2020-09-29 22:12:45 +02:00 committed by GitHub
commit 4c5a60c3c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/googletest.h
View File

@ -448,10 +448,11 @@ static inline string Munge(const string& filename) {
string result; string result;
while (fgets(buf, 4095, fp)) { while (fgets(buf, 4095, fp)) {
string line = MungeLine(buf); string line = MungeLine(buf);
char null_str[256]; const size_t str_size = 256;
char ptr_str[256]; char null_str[str_size];
sprintf(null_str, "%p", static_cast<void*>(NULL)); char ptr_str[str_size];
sprintf(ptr_str, "%p", reinterpret_cast<void*>(PTR_TEST_VALUE)); snprintf(null_str, str_size, "%p", static_cast<void*>(NULL));
snprintf(ptr_str, str_size, "%p", reinterpret_cast<void*>(PTR_TEST_VALUE));
StringReplace(&line, "__NULLP__", null_str); StringReplace(&line, "__NULLP__", null_str);
StringReplace(&line, "__PTRTEST__", ptr_str); StringReplace(&line, "__PTRTEST__", ptr_str);

5
src/stl_logging_unittest.cc
View File

@ -135,8 +135,9 @@ static void TestSTLLogging() {
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
v.push_back(i); v.push_back(i);
if (i > 0) expected += ' '; if (i > 0) expected += ' ';
char buf[256]; const size_t buf_size = 256;
sprintf(buf, "%d", i); char buf[buf_size];
snprintf(buf, buf_size, "%d", i);
expected += buf; expected += buf;
} }
v.push_back(100); v.push_back(100);