mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-01-19 04:49:25 +08:00
bc986b7ff6
The commit 3d94e07c49b5 has a few bugs which cause testsuite failure
in libstdc++. This is due to excess orientation check in __srefill_r()
and _ungetc_r(). Further, sscanf() family also calls ssvfscanf() family
with fp->_file == -1. This causes undesired orientation set/check for
sscanf() family. This patch fixes these problems.
Also, as in GLibC, do not set orientation in ungetc, and only set, but
do not check orientation in ungetwc.
Fixes: 3d94e07c49b5 ("newlib: libc: Fix crash on fprintf to a wide-oriented stream.")
Reported-by: Christophe Lyon <christophe.lyon@linaro.org>
Reported-by: Joel Sherrill <joel@rtems.org>
Co-developed-by: Corinna Vinschen <corinna@vinschen.de>
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
61 lines
1.5 KiB
C
61 lines
1.5 KiB
C
/*
|
|
* Code created by modifying iscanf.c which has following copyright.
|
|
*
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms are permitted
|
|
* provided that the above copyright notice and this paragraph are
|
|
* duplicated in all such forms and that any documentation,
|
|
* and/or other materials related to such
|
|
* distribution and use acknowledge that the software was developed
|
|
* by the University of California, Berkeley. The name of the
|
|
* University may not be used to endorse or promote products derived
|
|
* from this software without specific prior written permission.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
*/
|
|
|
|
#include <_ansi.h>
|
|
#include <reent.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdarg.h>
|
|
#include "local.h"
|
|
|
|
/*
|
|
* vsiscanf
|
|
*/
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
int
|
|
vsiscanf (const char *str,
|
|
const char *fmt,
|
|
va_list ap)
|
|
{
|
|
return _vsiscanf_r (_REENT, str, fmt, ap);
|
|
}
|
|
|
|
#endif /* !_REENT_ONLY */
|
|
|
|
int
|
|
_vsiscanf_r (struct _reent *ptr,
|
|
const char *str,
|
|
const char *fmt,
|
|
va_list ap)
|
|
{
|
|
FILE f;
|
|
|
|
f._flags = __SRD | __SSTR;
|
|
f._flags2 = 0;
|
|
f._bf._base = f._p = (unsigned char *) str;
|
|
f._bf._size = f._r = strlen (str);
|
|
f._read = __seofread;
|
|
f._ub._base = NULL;
|
|
f._lb._base = NULL;
|
|
f._file = -1; /* No file. */
|
|
return __ssvfiscanf_r (ptr, &f, fmt, ap);
|
|
}
|