mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

tuxtxt: fix rare crash / memory corruption

Browse Source 
cache manipulation outside locks is evil, and the variables have been
initialized in tuxtxt_init earlier anyway
This commit is contained in:
Stefan Seyfried
2016-01-02 11:31:40 +01:00
parent 0b8365f908
commit aab075bd70
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -1920,7 +1920,6 @@ static int oldfontheight = 0;
int Init(int source) int Init(int source)
{ {
int error, i; int error, i;
unsigned char magazine;
static std::string font_file; static std::string font_file;
/* init data */ /* init data */
@@ -1928,12 +1927,13 @@ int Init(int source)
//page_atrb[32] = transp<<4 | transp; //page_atrb[32] = transp<<4 | transp;
inputcounter = 2; inputcounter = 2;
#if TUXTXT_CFG_STANDALONE
unsigned char magazine;
for (magazine = 1; magazine < 9; magazine++) for (magazine = 1; magazine < 9; magazine++)
{ {
tuxtxt_cache.current_page [magazine] = -1; tuxtxt_cache.current_page [magazine] = -1;
tuxtxt_cache.current_subpage [magazine] = -1; tuxtxt_cache.current_subpage [magazine] = -1;
} }
#if TUXTXT_CFG_STANDALONE
/* init data */ /* init data */
memset(&tuxtxt_cache.astCachetable, 0, sizeof(tuxtxt_cache.astCachetable)); memset(&tuxtxt_cache.astCachetable, 0, sizeof(tuxtxt_cache.astCachetable));
memset(&tuxtxt_cache.subpagetable, 0xFF, sizeof(tuxtxt_cache.subpagetable)); memset(&tuxtxt_cache.subpagetable, 0xFF, sizeof(tuxtxt_cache.subpagetable));