Fix various memory leaks in http-push.c and http-walker.c

diff --git a/sideband.c b/sideband.c
index 1b14ff88924668e6803229d4d2cef981823522fb..756bbc28d71448781294151cbacd30f68b2bb97b 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -11,10 +11,19 @@
  * stream, aka "verbose").  A message over band #3 is a signal that
  * the remote died unexpectedly.  A flush() concludes the stream.
  */
-int recv_sideband(const char *me, int in_stream, int out, int err, char *buf, int bufsz)
+
+#define PREFIX "remote:"
+#define SUFFIX "\033[K"  /* change to "        " if ANSI sequences don't work */
+
+int recv_sideband(const char *me, int in_stream, int out, int err)
 {
+       unsigned pf = strlen(PREFIX);
+       unsigned sf = strlen(SUFFIX);
+       char buf[pf + LARGE_PACKET_MAX + sf + 1];
+       memcpy(buf, PREFIX, pf);
        while (1) {
-               int len = packet_read_line(in_stream, buf, bufsz);
+               int band, len;
+               len = packet_read_line(in_stream, buf + pf, LARGE_PACKET_MAX);
                if (len == 0)
                        break;
                if (len < 1) {
@@ -22,25 +31,58 @@ int recv_sideband(const char *me, int in_stream, int out, int err, char *buf, in
                        safe_write(err, buf, len);
                        return SIDEBAND_PROTOCOL_ERROR;
                }
+               band = buf[pf] & 0xff;
                len--;
-               switch (buf[0] & 0xFF) {
+               switch (band) {
                case 3:
-                       safe_write(err, "remote: ", 8);
-                       safe_write(err, buf+1, len);
-                       safe_write(err, "\n", 1);
+                       buf[pf] = ' ';
+                       buf[pf+1+len] = '\n';
+                       safe_write(err, buf, pf+1+len+1);
                        return SIDEBAND_REMOTE_ERROR;
                case 2:
-                       safe_write(err, "remote: ", 8);
-                       safe_write(err, buf+1, len);
+                       buf[pf] = ' ';
+                       len += pf+1;
+                       while (1) {
+                               int brk = pf+1;
+
+                               /* Break the buffer into separate lines. */
+                               while (brk < len) {
+                                       brk++;
+                                       if (buf[brk-1] == '\n' ||
+                                           buf[brk-1] == '\r')
+                                               break;
+                               }
+
+                               /*
+                                * Let's insert a suffix to clear the end
+                                * of the screen line, but only if current
+                                * line data actually contains something.
+                                */
+                               if (brk > pf+1 + 1) {
+                                       char save[sf];
+                                       memcpy(save, buf + brk, sf);
+                                       buf[brk + sf - 1] = buf[brk - 1];
+                                       memcpy(buf + brk - 1, SUFFIX, sf);
+                                       safe_write(err, buf, brk + sf);
+                                       memcpy(buf + brk, save, sf);
+                               } else
+                                       safe_write(err, buf, brk);
+
+                               if (brk < len) {
+                                       memmove(buf + pf+1, buf + brk, len - brk);
+                                       len = len - brk + pf+1;
+                               } else
+                                       break;
+                       }
                        continue;
                case 1:
-                       safe_write(out, buf+1, len);
+                       safe_write(out, buf + pf+1, len);
                        continue;
                default:
-                       len = sprintf(buf + 1,
+                       len = sprintf(buf,
                                      "%s: protocol error: bad band #%d\n",
-                                     me, buf[0] & 0xFF);
-                       safe_write(err, buf+1, len);
+                                     me, band);
+                       safe_write(err, buf, len);
                        return SIDEBAND_PROTOCOL_ERROR;
                }
        }