From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 30 Jul 2020 18:28:11 +0000 (-0400)
Subject: Merge branch 'bug40076_043' into bug40076_044
X-Git-Tag: tor-0.4.4.4-rc~17^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b4400e2093f68e349464eacd7dbe44cebf8d5c71;p=thirdparty%2Ftor.git

Merge branch 'bug40076_043' into bug40076_044
---

b4400e2093f68e349464eacd7dbe44cebf8d5c71
diff --cc src/lib/buf/buffers.c
index 95b384bf06,d7b73e3807..a5031a47a6
--- a/src/lib/buf/buffers.c
+++ b/src/lib/buf/buffers.c
@@@ -692,9 -692,11 +692,11 @@@ buf_move_all(buf_t *buf_out, buf_t *buf
    tor_assert(buf_out);
    if (!buf_in)
      return;
+   if (buf_datalen(buf_in) == 0)
+     return;
 -  if (BUG(buf_out->datalen >= INT_MAX || buf_in->datalen >= INT_MAX))
 +  if (BUG(buf_out->datalen > BUF_MAX_LEN || buf_in->datalen > BUF_MAX_LEN))
      return;
 -  if (BUG(buf_out->datalen >= INT_MAX - buf_in->datalen))
 +  if (BUG(buf_out->datalen > BUF_MAX_LEN - buf_in->datalen))
      return;
  
    if (buf_out->head == NULL) {