tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 23:34:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

upstream: vasnmprintf allocates str and returns -1; ok djm

Browse Source 
OpenBSD-Commit-ID: dae4c9e83d88471bf3b3f89e3da7a107b44df11c
This commit is contained in:
markus@openbsd.org 2020-03-06 18:12:55 +00:00 committed by Damien Miller
parent 714e1cbca1
commit 6fb6f186cb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utf8.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: utf8.c,v 1.8 2018/08/21 13:56:27 schwarze Exp $ */ /* $OpenBSD: utf8.c,v 1.9 2020/03/06 18:12:55 markus Exp $ */
/* /*
* Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
* *
@ -241,7 +241,7 @@ int
snmprintf(char *str, size_t sz, int *wp, const char *fmt, ...) snmprintf(char *str, size_t sz, int *wp, const char *fmt, ...)
{ {
va_list ap; va_list ap;
char *cp; char *cp = NULL;
int ret; int ret;
va_start(ap, fmt); va_start(ap, fmt);
@ -263,11 +263,13 @@ snmprintf(char *str, size_t sz, int *wp, const char *fmt, ...)
int int
vfmprintf(FILE *stream, const char *fmt, va_list ap) vfmprintf(FILE *stream, const char *fmt, va_list ap)
{ {
char *str; char *str = NULL;
int ret; int ret;
if ((ret = vasnmprintf(&str, INT_MAX, NULL, fmt, ap)) < 0) if ((ret = vasnmprintf(&str, INT_MAX, NULL, fmt, ap)) < 0) {
free(str);
return -1; return -1;
}
if (fputs(str, stream) == EOF) if (fputs(str, stream) == EOF)
ret = -1; ret = -1;
free(str); free(str);