mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/hdd_menu.cpp
	src/gui/hdd_menu.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-10-02 23:21:37 +02:00
parent 6458ea748a 463700033b
commit 0a0c8a13bf
39 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/system/helpers.cpp
View File

@@ -1603,8 +1603,16 @@ string readFile(string file)
if (tmpData.is_open()) {
tmpData.seekg(0, tmpData.end);
int length = tmpData.tellg();
if (length > 0xffff) { /* longer than 64k? better read in chunks! */
cerr << __func__ << ": file " << file << " too big (" << length << " bytes)" << endl;
return "";
}
tmpData.seekg(0, tmpData.beg);
char* buffer = new char[length+1];
if (! buffer) {
cerr << __func__ << ": allocating " << (length + 1) << " bytes for buffer failed" << endl;
return "";
}
tmpData.read(buffer, length);
tmpData.close();
buffer[length] = '\0';