win32.c: limit write size on console

nobu · nobu · commit 73ae3e9b4648 · 2018-07-28T15:29:14.000Z
* win32/win32.c (constat_parse): split long buffer and limit write
  size on a console, as well as rb_w32_write.
  [ruby-dev:50597] [Bug #14942]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/win32/win32.c b/win32/win32.c
@@ -6822,6 +6822,10 @@ constat_apply(HANDLE handle, struct constat *s, WCHAR w)
     }
 }
 
+/* get rid of console writing bug; assume WriteConsole and WriteFile
+ * on a console share the same limit. */
+static const long MAXSIZE_CONSOLE_WRITING = 31366;
+
 /* License: Ruby's */
 static long
 constat_parse(HANDLE h, struct constat *s, const WCHAR **ptrp, long *lenp)
@@ -6876,7 +6880,7 @@ constat_parse(HANDLE h, struct constat *s, const WCHAR **ptrp, long *lenp)
 	    }
 	    rest = 0;
 	}
-	else {
+	else if ((rest = *lenp - len) < MAXSIZE_CONSOLE_WRITING) {
 	    continue;
 	}
 	*ptrp = ptr;
@@ -7138,8 +7142,7 @@ rb_w32_write(int fd, const void *buf, size_t size)
 
     ret = 0;
   retry:
-    /* get rid of console writing bug */
-    len = (_osfile(fd) & FDEV) ? min(32 * 1024, size) : size;
+    len = (_osfile(fd) & FDEV) ? min(MAXSIZE_CONSOLE_WRITING, size) : size;
     size -= len;
   retry2:
 

Original file line number	Diff line number	Diff line change
`@@ -6822,6 +6822,10 @@ constat_apply(HANDLE handle, struct constat *s, WCHAR w)`
`6822`	`6822`	`}`
`6823`	`6823`	`}`
`6824`	`6824`
	`6825`	`+/* get rid of console writing bug; assume WriteConsole and WriteFile`
	`6826`	`+ * on a console share the same limit. */`
	`6827`	`+static const long MAXSIZE_CONSOLE_WRITING = 31366;`
	`6828`	`+`
`6825`	`6829`	`/* License: Ruby's */`
`6826`	`6830`	`static long`
`6827`	`6831`	`constat_parse(HANDLE h, struct constat s, const WCHAR ptrp, long lenp)`
`@@ -6876,7 +6880,7 @@ constat_parse(HANDLE h, struct constat s, const WCHAR ptrp, long lenp)`
`6876`	`6880`	`}`
`6877`	`6881`	`rest = 0;`
`6878`	`6882`	`}`
`6879`		`- else {`
	`6883`	`+ else if ((rest = *lenp - len) < MAXSIZE_CONSOLE_WRITING) {`
`6880`	`6884`	`continue;`
`6881`	`6885`	`}`
`6882`	`6886`	`*ptrp = ptr;`
`@@ -7138,8 +7142,7 @@ rb_w32_write(int fd, const void *buf, size_t size)`
`7138`	`7142`
`7139`	`7143`	`ret = 0;`
`7140`	`7144`	`retry:`
`7141`		`- /* get rid of console writing bug */`
`7142`		`- len = (_osfile(fd) & FDEV) ? min(32 * 1024, size) : size;`
	`7145`	`+ len = (_osfile(fd) & FDEV) ? min(MAXSIZE_CONSOLE_WRITING, size) : size;`
`7143`	`7146`	`size -= len;`
`7144`	`7147`	`retry2:`
`7145`	`7148`