Steven Murdoch 14 лет назад
Родитель
Сommit
93792b5aa6
1 измененных файлов с 3 добавлено и 2 удалено
  1. 3 2
      src/common/util.c

+ 3 - 2
src/common/util.c

@@ -3462,10 +3462,11 @@ tor_read_all_handle(HANDLE h, char *buf, size_t count, HANDLE hProcess)
       continue;
     }
 
+    /* There is data to read; read it */
     retval = ReadFile(h, buf+numread, count-numread, &byte_count, NULL);
+    tor_assert(byte_count + numread <= count);
     if (!retval) {
-      log_warn(LD_GENERAL,
-        "Failed to read from handle: %s",
+      log_warn(LD_GENERAL, "Failed to read from handle: %s",
         format_win32_error(GetLastError()));
       return -1;
     } else if (0 == byte_count) {