diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2007-03-12 20:30:08 +0000 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2007-03-12 20:30:08 +0000 |
| commit | 99304ce6c4067c1ad11d9c4723580cb09bf1d853 (patch) | |
| tree | 036546660dab37a67da4adc69fbe41610e64fdf8 /newlib/libc/stdio/vasprintf.c | |
| parent | 9c28809c0f505ea1969523aad89b3a7df045bb7c (diff) | |
| download | newlib-99304ce6c4067c1ad11d9c4723580cb09bf1d853.zip newlib-99304ce6c4067c1ad11d9c4723580cb09bf1d853.tar.gz newlib-99304ce6c4067c1ad11d9c4723580cb09bf1d853.tar.bz2 | |
2007-03-12 Eric Blake <ebb9@byu.net>
* libc/stdio/fvwrite.c (__sfvwrite_r): Fix reentrancy.
* libc/stdio/vasprintf.c (vasprintf, _vasprintf_r): Pass failed
allocation to caller.
* libc/stdio/asprintf.c (_asprintf_r, asprintf): Likewise.
* libc/stdio/asiprintf.c (_asiprintf_r, asiprintf): Likewise.
* libc/stdio/vasiprintf.c (vasiprintf, _vasiprintf_r): Likewise.
Diffstat (limited to 'newlib/libc/stdio/vasprintf.c')
| -rw-r--r-- | newlib/libc/stdio/vasprintf.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/newlib/libc/stdio/vasprintf.c b/newlib/libc/stdio/vasprintf.c index 43197d5..2c8065c 100644 --- a/newlib/libc/stdio/vasprintf.c +++ b/newlib/libc/stdio/vasprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 1990, 2007 The Regents of the University of California. * All rights reserved. * * Redistribution and use in source and binary forms are permitted @@ -46,8 +46,11 @@ _DEFUN(vasprintf, (strp, fmt, ap), f._bf._size = f._w = 0; f._file = -1; /* No file. */ ret = _vfprintf_r (_REENT, &f, fmt, ap); - *f._p = 0; - *strp = f._bf._base; + if (ret >= 0) + { + *f._p = 0; + *strp = f._bf._base; + } return ret; } @@ -68,8 +71,10 @@ _DEFUN(_vasprintf_r, (ptr, strp, fmt, ap), f._bf._size = f._w = 0; f._file = -1; /* No file. */ ret = _vfprintf_r (ptr, &f, fmt, ap); - *f._p = 0; - *strp = f._bf._base; + if (ret >= 0) + { + *f._p = 0; + *strp = f._bf._base; + } return ret; } - |