ratox

FIFO based tox client
Log | Files | Refs | README | LICENSE

commit 704194ad52038665b64ecf6ff0e1693eff62907c
parent 713f9fc99f9fde976aa3f70d5db0202066c07f8a
Author: pranomostro <pranomestro@gmail.com>
Date:   Mon Dec  5 13:20:07 +0100

Fix possible NULL memcpy() after allocating data.

Diffstat:
ratox.c | 10+++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ratox.c b/ratox.c @@ -1025,14 +1025,14 @@ datasave(void) tox_get_savedata(tox, intermediate); + sz += encryptsavefile ? TOX_PASS_ENCRYPTION_EXTRA_LENGTH : 0; + data = malloc(sz); + if(!data) + eprintf("malloc:"); + if (encryptsavefile){ - sz += TOX_PASS_ENCRYPTION_EXTRA_LENGTH; - data = malloc(sz); - if (!data) - eprintf("malloc:"); tox_pass_encrypt(intermediate, sz - TOX_PASS_ENCRYPTION_EXTRA_LENGTH, passphrase, pplen, data, NULL); } else { - data = malloc(sz); memcpy(data, intermediate, sz); } if (write(fd, data, sz) != sz)