diff mbox series

[v2,11/17] stdio-common: Add tests for formatted sscanf input specifiers

Message ID alpine.DEB.2.21.2503010234260.12637@angie.orcam.me.uk (mailing list archive)
State Superseded
Delegated to: Joseph Myers
Headers
Series stdio-common: Formatted scanf input specifier tests |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Test passed

Commit Message

Maciej W. Rozycki March 1, 2025, 10:45 p.m. UTC 
  From: Maciej W. Rozycki <macro@redhat.com>

Wire sscanf into test infrastructure for formatted scanf input 
specifiers.
---
No change from v1.
---
 stdio-common/Makefile                      |    2 
 stdio-common/tst-scanf-format-ss-c.c       |   22 ++++++++
 stdio-common/tst-scanf-format-ss-char.c    |   22 ++++++++
 stdio-common/tst-scanf-format-ss-double.c  |   22 ++++++++
 stdio-common/tst-scanf-format-ss-float.c   |   22 ++++++++
 stdio-common/tst-scanf-format-ss-int.c     |   22 ++++++++
 stdio-common/tst-scanf-format-ss-ldouble.c |   22 ++++++++
 stdio-common/tst-scanf-format-ss-llong.c   |   22 ++++++++
 stdio-common/tst-scanf-format-ss-long.c    |   22 ++++++++
 stdio-common/tst-scanf-format-ss-short.c   |   22 ++++++++
 stdio-common/tst-scanf-format-ss-uchar.c   |   22 ++++++++
 stdio-common/tst-scanf-format-ss-uint.c    |   22 ++++++++
 stdio-common/tst-scanf-format-ss-ullong.c  |   22 ++++++++
 stdio-common/tst-scanf-format-ss-ulong.c   |   22 ++++++++
 stdio-common/tst-scanf-format-ss-ushort.c  |   22 ++++++++
 stdio-common/tst-scanf-format-ss.h         |   72 +++++++++++++++++++++++++++++
 16 files changed, 381 insertions(+), 1 deletion(-)

Comments

Joseph Myers March 4, 2025, 9:47 p.m. UTC | #1 
On Sat, 1 Mar 2025, Maciej W. Rozycki wrote:

> +  do									\
> +    {									\
> +      ch = read_input ();						\
> +      if (ch < 0)							\
> +	{								\
> +	  result = ch;							\
> +	  goto out;							\
> +	}								\
> +      if (i == sscanf_buf_size)						\
> +	{								\
> +	  sscanf_buf_size += SIZE_CHUNK;				\
> +	  sscanf_buf = xrealloc (sscanf_buf, sscanf_buf_size);		\
> +	}								\
> +      sscanf_buf[i++] = ch;						\
> +    }									\
> +  while (ch != ':');							\
> +  sscanf_buf[i++] = '\0';						\

I think there's potential for a one-byte overrun when writing the null 
terminator here, if i == sscanf_buf_size on exiting this loop.

The same applies to patch 14.
Maciej W. Rozycki March 25, 2025, 10:23 a.m. UTC | #2 
On Tue, 4 Mar 2025, Joseph Myers wrote:

> > +  do									\
> > +    {									\
> > +      ch = read_input ();						\
> > +      if (ch < 0)							\
> > +	{								\
> > +	  result = ch;							\
> > +	  goto out;							\
> > +	}								\
> > +      if (i == sscanf_buf_size)						\
> > +	{								\
> > +	  sscanf_buf_size += SIZE_CHUNK;				\
> > +	  sscanf_buf = xrealloc (sscanf_buf, sscanf_buf_size);		\
> > +	}								\
> > +      sscanf_buf[i++] = ch;						\
> > +    }									\
> > +  while (ch != ':');							\
> > +  sscanf_buf[i++] = '\0';						\
> 
> I think there's potential for a one-byte overrun when writing the null 
> terminator here, if i == sscanf_buf_size on exiting this loop.
> 
> The same applies to patch 14.

 Right, fixed in v3.  Thank you.

  Maciej
diff mbox series

Patch

Index: glibc/stdio-common/Makefile
===================================================================
--- glibc.orig/stdio-common/Makefile
+++ glibc/stdio-common/Makefile
@@ -52,7 +52,7 @@  nonfmt-xprintf-stems := \
 xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems))
 
 # List of markers for scanf family function tests.
-xscanf-funcs := s f
+xscanf-funcs := s f ss
 
 # List of data types and formats for individual per-conversion scanf tests.
 # Further conversions are provided by sysdeps.
Index: glibc/stdio-common/tst-scanf-format-ss-c.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-c.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for the character conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-character.h"
+#include "tst-scanf-format-skeleton-c.c"
Index: glibc/stdio-common/tst-scanf-format-ss-char.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-char.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for signed char conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-char.c"
Index: glibc/stdio-common/tst-scanf-format-ss-double.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-double.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for double conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-real.h"
+#include "tst-scanf-format-skeleton-double.c"
Index: glibc/stdio-common/tst-scanf-format-ss-float.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-float.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for float conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-real.h"
+#include "tst-scanf-format-skeleton-float.c"
Index: glibc/stdio-common/tst-scanf-format-ss-int.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-int.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for int conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-int.c"
Index: glibc/stdio-common/tst-scanf-format-ss-ldouble.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-ldouble.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for long double conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-real.h"
+#include "tst-scanf-format-skeleton-ldouble.c"
Index: glibc/stdio-common/tst-scanf-format-ss-llong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-llong.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for long long conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-llong.c"
Index: glibc/stdio-common/tst-scanf-format-ss-long.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-long.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for long conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-long.c"
Index: glibc/stdio-common/tst-scanf-format-ss-short.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-short.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for short int conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-short.c"
Index: glibc/stdio-common/tst-scanf-format-ss-uchar.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-uchar.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for unsigned char conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-uchar.c"
Index: glibc/stdio-common/tst-scanf-format-ss-uint.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-uint.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for unsigned int conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-uint.c"
Index: glibc/stdio-common/tst-scanf-format-ss-ullong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-ullong.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for unsigned long long int conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-ullong.c"
Index: glibc/stdio-common/tst-scanf-format-ss-ulong.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-ulong.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for unsigned long int conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-ulong.c"
Index: glibc/stdio-common/tst-scanf-format-ss-ushort.c
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss-ushort.c
@@ -0,0 +1,22 @@ 
+/* Test for formatted 'sscanf' input for unsigned short int conversions.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include "tst-scanf-format-skeleton.h"
+#include "tst-scanf-format-ss.h"
+#include "tst-scanf-format-integer.h"
+#include "tst-scanf-format-skeleton-ushort.c"
Index: glibc/stdio-common/tst-scanf-format-ss.h
===================================================================
--- /dev/null
+++ glibc/stdio-common/tst-scanf-format-ss.h
@@ -0,0 +1,72 @@ 
+/* Test feature wrapper for formatted 'scanf' input.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <support/support.h>
+
+static char *sscanf_buf;
+static size_t sscanf_buf_size;
+
+static void __attribute__ ((destructor))
+scanf_under_test_fini (void)
+{
+  free (sscanf_buf);
+}
+
+#define scanf_under_test(...)						\
+({									\
+  __label__ out;							\
+  size_t i = 0;								\
+  int result;								\
+  int ch;								\
+									\
+  do									\
+    {									\
+      ch = read_input ();						\
+      if (ch < 0)							\
+	{								\
+	  result = ch;							\
+	  goto out;							\
+	}								\
+      if (i == sscanf_buf_size)						\
+	{								\
+	  sscanf_buf_size += SIZE_CHUNK;				\
+	  sscanf_buf = xrealloc (sscanf_buf, sscanf_buf_size);		\
+	}								\
+      sscanf_buf[i++] = ch;						\
+    }									\
+  while (ch != ':');							\
+  sscanf_buf[i++] = '\0';						\
+									\
+  ch = ungetc (ch, stdin);						\
+  if (ch == EOF)							\
+    {									\
+      result = INPUT_ERROR;						\
+      goto out;								\
+    }									\
+									\
+  result = sscanf (sscanf_buf, __VA_ARGS__);				\
+  if (result == EOF)							\
+    result = INPUT_EOF;							\
+									\
+out:									\
+  result;								\
+})