X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fvasprintf.c;h=149c29242cbb0fb25aaa10fc46964a512823feeb;hb=fc86a0be1b68e4b24d9249d763d33701b3a81623;hp=7c8f212d724d9f5da378a921f174b1c5460487d4;hpb=757bd39e4b07efaefaef3ef11027b7b7b40f5911;p=gnulib.git diff --git a/lib/vasprintf.c b/lib/vasprintf.c index 7c8f212d7..149c29242 100644 --- a/lib/vasprintf.c +++ b/lib/vasprintf.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifdef HAVE_CONFIG_H # include @@ -22,6 +22,8 @@ /* Specification. */ #include "vasprintf.h" +#include + #include "vasnprintf.h" int @@ -31,7 +33,10 @@ vasprintf (char **resultp, const char *format, va_list args) char *result = vasnprintf (NULL, &length, format, args); if (result == NULL) return -1; + *resultp = result; - /* Return the number of resulting bytes, excluding the trailing NUL. */ + /* Return the number of resulting bytes, excluding the trailing NUL. + If it wouldn't fit in an 'int', vasnprintf() would have returned NULL + and set errno to EOVERFLOW. */ return length; }