projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I _think_ this should fix the problem reported by `Stacey': failure
[u/mdw/putty]
/
scp.c
diff --git
a/scp.c
b/scp.c
index
de39484
..
70f13be
100644
(file)
--- a/
scp.c
+++ b/
scp.c
@@
-178,14
+178,13
@@
int from_backend(void *frontend, int is_stderr, const char *data, int datalen)
unsigned char *p = (unsigned char *) data;
unsigned len = (unsigned) datalen;
unsigned char *p = (unsigned char *) data;
unsigned len = (unsigned) datalen;
- assert(len > 0);
-
/*
* stderr data is just spouted to local stderr and otherwise
* ignored.
*/
if (is_stderr) {
/*
* stderr data is just spouted to local stderr and otherwise
* ignored.
*/
if (is_stderr) {
- fwrite(data, 1, len, stderr);
+ if (len > 0)
+ fwrite(data, 1, len, stderr);
return 0;
}
return 0;
}
@@
-195,7
+194,7
@@
int from_backend(void *frontend, int is_stderr, const char *data, int datalen)
if (!outptr)
return 0;
if (!outptr)
return 0;
- if (
outlen > 0
) {
+ if (
(outlen > 0) && (len > 0)
) {
unsigned used = outlen;
if (used > len)
used = len;
unsigned used = outlen;
if (used > len)
used = len;