summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2013-10-09 16:30:37 +0200
committerGravatar Nikias Bassen2013-10-09 16:30:37 +0200
commite9995aee384bdbac6c6afc0f4548a080eb4241bc (patch)
tree1b0adc7cdb89725b37a6dbd199ae0475c1bad14c
parente0fe1f58c50ed69dafc00e16250a0c7d31d15461 (diff)
downloadlibplist-e9995aee384bdbac6c6afc0f4548a080eb4241bc.tar.gz
libplist-e9995aee384bdbac6c6afc0f4548a080eb4241bc.tar.bz2
base64: use strtok_r instead of strtok to make sure we're thread safe
-rw-r--r--src/base64.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/base64.c b/src/base64.c
index e558d9e..96d49f3 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -111,13 +111,14 @@ unsigned char *base64decode(const char *buf, size_t *size)
unsigned char *line;
int p = 0;
+ char* saveptr = NULL;
- line = (unsigned char*)strtok((char*)buf, "\r\n\t ");
+ line = (unsigned char*)strtok_r((char*)buf, "\r\n\t ", &saveptr);
while (line) {
p+=base64decode_block(outbuf+p, (const char*)line, strlen((char*)line));
// get next line of base64 encoded block
- line = (unsigned char*)strtok(NULL, "\r\n\t ");
+ line = (unsigned char*)strtok_r(NULL, "\r\n\t ", &saveptr);
}
outbuf[p] = 0;
*size = p;