mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 22:11:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #933 from vcaputo/readfiletostring_clearfirst

Browse Source 
libchrome: Fix append bug in file_util::ReadFileToString()
This commit is contained in:
Vito Caputo 2014-10-21 18:04:29 -07:00
commit c60f3b2faa
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/files/readfiletostring_clearfirst.patch vendored Normal file
View File

@ -0,0 +1,11 @@
--- a/file_util.cc 2014-10-21 19:09:47.052101527 -0400
+++ b/file_util.cc 2014-10-21 19:22:00.619134259 -0400
@@ -152,6 +152,8 @@
}
bool ReadFileToString(const FilePath& path, std::string* contents) {
+ if (contents)
+ contents->clear();
if (path.ReferencesParent())
return false;
FILE* file = OpenFile(path, "rb");

0
sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609-r3.ebuild vendored
View File

1
sdk_container/src/third_party/coreos-overlay/coreos-base/libchrome/libchrome-180609.ebuild vendored
View File

@ -42,6 +42,7 @@ src_prepare() {
epatch "${FILESDIR}"/base-125070-no-X.patch epatch "${FILESDIR}"/base-125070-no-X.patch
epatch "${FILESDIR}"/base-125070-x32.patch epatch "${FILESDIR}"/base-125070-x32.patch
epatch "${FILESDIR}"/readfiletostring_clearfirst.patch
} }
src_configure() { src_configure() {