From 99304ce6c4067c1ad11d9c4723580cb09bf1d853 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Mon, 12 Mar 2007 20:30:08 +0000 Subject: 2007-03-12 Eric Blake * 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. --- newlib/libc/stdio/asprintf.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'newlib/libc/stdio/asprintf.c') diff --git a/newlib/libc/stdio/asprintf.c b/newlib/libc/stdio/asprintf.c index 928e8497a..39536800b 100644 --- a/newlib/libc/stdio/asprintf.c +++ b/newlib/libc/stdio/asprintf.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 @@ -57,8 +57,11 @@ _asprintf_r(ptr, strp, fmt, va_alist) #endif ret = vfprintf (&f, fmt, ap); va_end (ap); - *f._p = 0; - *strp = f._bf._base; + if (ret >= 0) + { + *f._p = 0; + *strp = f._bf._base; + } return (ret); } @@ -79,7 +82,7 @@ asprintf(strp, fmt, va_alist) int ret; va_list ap; FILE f; - + /* mark a zero-length reallocatable buffer */ f._flags = __SWR | __SSTR | __SMBF; f._bf._base = f._p = NULL; @@ -92,8 +95,11 @@ asprintf(strp, fmt, va_alist) #endif ret = vfprintf (&f, fmt, ap); va_end (ap); - *f._p = 0; - *strp = f._bf._base; + if (ret >= 0) + { + *f._p = 0; + *strp = f._bf._base; + } return (ret); } -- cgit v1.2.3