Merge pull request #666 from FullName/nTox-various

Various changes to nTox including a potential crash (also possible from remote!)...

2 files changed, 10 insertions, 6 deletions

diff --git a/toxcore/network.c b/toxcore/network.c
index e5a80254..82f29aef 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -310,9 +310,12 @@ typedef struct {
 
 int networking_wait_prepare(Networking_Core *net, uint32_t sendqueue_length, uint8_t *data, uint16_t *lenptr)
 {
-    if ((data == NULL) || (*lenptr < sizeof(select_info))) {
-        *lenptr = sizeof(select_info);
-        return 0;
+    if ((data == NULL) || !lenptr || (*lenptr < sizeof(select_info))) {
+        if (lenptr) {
+            *lenptr = sizeof(select_info);
+            return 0;
+        } else
+            return -1;
     }
 
     *lenptr = sizeof(select_info);
diff --git a/toxcore/tox.h b/toxcore/tox.h
index 08727d2a..469a1f78 100644
--- a/toxcore/tox.h
+++ b/toxcore/tox.h
@@ -606,10 +606,11 @@ void tox_do(Tox *tox);
  * Prepares the data required to call tox_wait_execute() asynchronously
  *
  * data[] is reserved and kept by the caller
- * len is in/out: in = reserved data[], out = required data[]
+ * *lenptr is in/out: in = reserved data[], out = required data[]
  *
- *  returns 1 on success
- *  returns 0 on failure (length is insufficient)
+ *  returns  1 on success
+ *  returns  0 if *lenptr is insufficient
+ *  returns -1 if lenptr is NULL
  *
  *
  * tox_wait_execute(): function can be called asynchronously