From: Marten Richter Date: Sun, 12 Oct 2014 18:06:10 +0000 (+0200) Subject: Fix segfault in wselectlist due to missing thread safety X-Git-Tag: 0-5-0~55 X-Git-Url: https://git.vomp.tv/gitweb/?a=commitdiff_plain;h=c4773988d9d08593912b97f4e65d686a3e8508e2;p=vompclient.git Fix segfault in wselectlist due to missing thread safety --- diff --git a/wselectlist.cc b/wselectlist.cc index ad56e2d..7a08144 100644 --- a/wselectlist.cc +++ b/wselectlist.cc @@ -180,13 +180,14 @@ void WSelectList::drawOptionLine(char* text, int xpos, int ypos, int width, cons strncpy(buffer, text, 199); int currentColumn = taboffset; char* pointer; + char* savepointer; - pointer = strtok(buffer, "\t\n"); + pointer = strtok_r(buffer, "\t\n", &savepointer); while(pointer) { drawText(pointer, xposmod + columns[currentColumn], ypos_mod + curline * fontHeight, width - columns[currentColumn], colour); - pointer = strtok(NULL, "\t\n"); + pointer = strtok_r(NULL, "\t\n", &savepointer); if (pointer) { char delimiter = text[pointer - buffer-1]; if (delimiter == '\t') currentColumn++;