about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-01-24 08:25:13 +0000
committerRoland McGrath <roland@gnu.org>1996-01-24 08:25:13 +0000
commit914d9d7bdfdafd7a7c4416cb6f58bb5e844d3482 (patch)
tree02e70a854a25dce7fb8ec624057a678f15aa35d7
parenta66067befed6a453b75a2a0caac2c50d3a6e9cfb (diff)
downloadglibc-914d9d7bdfdafd7a7c4416cb6f58bb5e844d3482.tar.gz
glibc-914d9d7bdfdafd7a7c4416cb6f58bb5e844d3482.tar.xz
glibc-914d9d7bdfdafd7a7c4416cb6f58bb5e844d3482.zip
* stdio-common/vfscanf.c: Disallow l flag after ll or L. cvs/libc-960124
-rw-r--r--ChangeLog2
-rw-r--r--stdio-common/vfscanf.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c5af3ed83..b50f6cd829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 Wed Jan 24 03:22:07 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
+	* stdio-common/vfscanf.c: Disallow l flag after ll or L.
+
 	* stdio-common/Makefile (tests): Add scanf[1-9].
 	* stdio-common/scanf[1-9].c: New files.  Bug tests from hjl.
 
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 8a799acf78..46f0658ef1 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -313,7 +313,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	    flags |= SHORT;
 	    break;
 	  case 'l':
-	    if (flags & SHORT)
+	    if (flags & (SHORT|LONGDBL))
 	      conv_error ();
 	    else if (flags & LONG)
 	      {