From 704194ad52038665b64ecf6ff0e1693eff62907c Mon Sep 17 00:00:00 2001
From: pranomostro <pranomestro@gmail.com>
Date: Mon, 5 Dec 2016 13:20:07 +0100
Subject: Fix possible NULL memcpy() after allocating data.

---
 ratox.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'ratox.c')

diff --git a/ratox.c b/ratox.c
index 6a1e8a7..9e129c7 100644
--- 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)
-- 
cgit v1.2.3