diff options
| -rw-r--r-- | sys/src/ape/lib/ap/stdio/_IO_putc.c | 20 | ||||
| -rw-r--r-- | sys/src/ape/lib/ap/stdio/sclose.c | 23 | ||||
| -rw-r--r-- | sys/src/libstdio/_IO_putc.c | 23 | ||||
| -rw-r--r-- | sys/src/libstdio/sclose.c | 22 |
4 files changed, 54 insertions, 34 deletions
diff --git a/sys/src/ape/lib/ap/stdio/_IO_putc.c b/sys/src/ape/lib/ap/stdio/_IO_putc.c index 375b43eb0..0433a5913 100644 --- a/sys/src/ape/lib/ap/stdio/_IO_putc.c +++ b/sys/src/ape/lib/ap/stdio/_IO_putc.c @@ -40,18 +40,20 @@ int _IO_putc(int c, FILE *f){ if(f->flags&STRING){ f->rp=f->buf+f->bufl; if(f->wp==f->rp){ - if(f->flags&BALLOC) - f->buf=realloc(f->buf, f->bufl+BUFSIZ); - else{ + if(f->flags&BALLOC){ + char *t = realloc(f->buf, f->bufl+BUFSIZ); + if(t==NULL){ + f->state=ERR; + return EOF; + } + f->buf=t; + f->wp=t+f->bufl; + f->bufl+=BUFSIZ; + f->rp=t+f->bufl; + }else{ f->state=ERR; return EOF; } - if(f->buf==NULL){ - f->state=ERR; - return EOF; - } - f->rp=f->buf+f->bufl; - f->bufl+=BUFSIZ; } *f->wp++=c; } diff --git a/sys/src/ape/lib/ap/stdio/sclose.c b/sys/src/ape/lib/ap/stdio/sclose.c index d55396a3a..b964e19dd 100644 --- a/sys/src/ape/lib/ap/stdio/sclose.c +++ b/sys/src/ape/lib/ap/stdio/sclose.c @@ -7,28 +7,35 @@ char *_IO_sclose(FILE *f){ switch(f->state){ default: /* ERR CLOSED */ + Error: if(f->buf && f->flags&BALLOC) free(f->buf); - f->state=CLOSED; - f->flags=0; - return NULL; + f->buf=0; + break; case OPEN: f->buf=malloc(1); f->buf[0]='\0'; break; case RD: case END: - f->flags=0; break; case RDWR: case WR: + f->rp=f->buf+f->bufl; if(f->wp==f->rp){ - if(f->flags&BALLOC) - f->buf=realloc(f->buf, f->bufl+1); - if(f->buf==NULL) return NULL; + if(f->flags&BALLOC){ + char *t = realloc(f->buf, f->bufl+1); + if(t==NULL) + goto Error; + f->buf=t; + f->wp=t+f->bufl; + } else { + if(f->wp > f->buf) + *(f->wp-1) = '\0'; + goto Error; + } } *f->wp='\0'; - f->flags=0; break; } f->state=CLOSED; diff --git a/sys/src/libstdio/_IO_putc.c b/sys/src/libstdio/_IO_putc.c index 4c3a74238..6509963e6 100644 --- a/sys/src/libstdio/_IO_putc.c +++ b/sys/src/libstdio/_IO_putc.c @@ -18,7 +18,8 @@ int _IO_putc(int c, FILE *f){ case CLOSED: return EOF; case OPEN: - _IO_setvbuf(f); + if(_IO_setvbuf(f)!=0) + return EOF; /* fall through */ case RDWR: case END: @@ -38,18 +39,20 @@ int _IO_putc(int c, FILE *f){ if(f->flags&STRING){ f->rp=f->buf+f->bufl; if(f->wp==f->rp){ - if(f->flags&BALLOC) - f->buf=realloc(f->buf, f->bufl+BUFSIZ); - else{ + if(f->flags&BALLOC){ + char *t = realloc(f->buf, f->bufl+BUFSIZ); + if(t==NULL){ + f->state=ERR; + return EOF; + } + f->buf=t; + f->wp=t+f->bufl; + f->bufl+=BUFSIZ; + f->rp=t+f->bufl; + }else{ f->state=ERR; return EOF; } - if(f->buf==NULL){ - f->state=ERR; - return EOF; - } - f->rp=f->buf+f->bufl; - f->bufl+=BUFSIZ; } *f->wp++=c; } diff --git a/sys/src/libstdio/sclose.c b/sys/src/libstdio/sclose.c index 940b80227..b32f27c38 100644 --- a/sys/src/libstdio/sclose.c +++ b/sys/src/libstdio/sclose.c @@ -5,27 +5,35 @@ char *sclose(FILE *f){ switch(f->state){ default: /* ERR CLOSED */ + Error: if(f->buf && f->flags&BALLOC) free(f->buf); - f->flags=0; - return NULL; + f->buf=0; + break; case OPEN: f->buf=malloc(1); f->buf[0]='\0'; break; case RD: case END: - f->flags=0; break; case RDWR: case WR: + f->rp=f->buf+f->bufl; if(f->wp==f->rp){ - if(f->flags&BALLOC) - f->buf=realloc(f->buf, f->bufl+1); - if(f->buf==NULL) return NULL; + if(f->flags&BALLOC){ + char *t = realloc(f->buf, f->bufl+1); + if(t==NULL) + goto Error; + f->buf=t; + f->wp=t+f->bufl; + } else { + if(f->wp > f->buf) + *(f->wp-1) = '\0'; + goto Error; + } } *f->wp='\0'; - f->flags=0; break; } f->state=CLOSED; |