openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix AnimationParser remove_prefix test 

The test fails because TEST_STRING, a char[], is silently
converted to a std::string, passed to remove_prefix, then
the string is destroyed, but a pointer to the string is
returned.

Fix it by changing the signature of remove_prefix to use
std::string_view to be more robust in handling raw char*.

Test: run it
Change-Id: I553c066907f09cf330c8b7a4659db5a1fee82cac
This commit is contained in:
Yifan Hong 2020-08-05 17:38:46 -07:00
parent 7c95de7591
commit 2a06ae8299
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
healthd/AnimationParser.cpp
View File

@ -37,8 +37,8 @@ bool can_ignore_line(const char* str) {
return true;
}
bool remove_prefix(const std::string& line, const char* prefix, const char** rest) {
const char* str = line.c_str();
bool remove_prefix(std::string_view line, const char* prefix, const char** rest) {
const char* str = line.data();
int start;
char c;

4
healthd/AnimationParser.h
View File

@ -17,6 +17,8 @@
#ifndef HEALTHD_ANIMATION_PARSER_H
#define HEALTHD_ANIMATION_PARSER_H
#include <string_view>
#include "animation.h"
namespace android {
@ -24,7 +26,7 @@ namespace android {
bool parse_animation_desc(const std::string& content, animation* anim);
bool can_ignore_line(const char* str);
bool remove_prefix(const std::string& str, const char* prefix, const char** rest);
bool remove_prefix(std::string_view str, const char* prefix, const char** rest);
bool parse_text_field(const char* in, animation::text_field* field);
} // namespace android