Index: stable/11/lib/libc/stdio/gets_s.c =================================================================== --- stable/11/lib/libc/stdio/gets_s.c (revision 335334) +++ stable/11/lib/libc/stdio/gets_s.c (revision 335335) @@ -1,102 +1,102 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. * Copyright (c) 2017, 2018 - * Cyril S. E. Schubert. All rights reserved. + * Cyril S. E. Schubert * * This code is derived from software contributed to Berkeley by * Chris Torek. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include "namespace.h" #include #include #include #include #include "un-namespace.h" #include "libc_private.h" #include "local.h" static inline char * _gets_s(char *buf, rsize_t n) { int c; char *s; ORIENT(stdin, -1); for (s = buf, n--; (c = __sgetc(stdin)) != '\n' && n > 0 ; n--) { if (c == EOF) { if (s == buf) { return (NULL); } else break; } else *s++ = c; } /* * If end of buffer reached, discard until \n or eof. * Then throw an error. */ if (n == 0) { /* discard */ while ((c = __sgetc(stdin)) != '\n' && c != EOF); /* throw the error after lock released prior to exit */ __throw_constraint_handler_s("gets_s : end of buffer", E2BIG); return (NULL); } *s = 0; return (buf); } /* ISO/IEC 9899:2011 K.3.7.4.1 */ char * gets_s(char *buf, rsize_t n) { char *ret; if (buf == NULL) { __throw_constraint_handler_s("gets_s : str is NULL", EINVAL); return(NULL); } else if (n > RSIZE_MAX) { __throw_constraint_handler_s("gets_s : n > RSIZE_MAX", EINVAL); return(NULL); } else if (n == 0) { __throw_constraint_handler_s("gets_s : n == 0", EINVAL); return(NULL); } FLOCKFILE_CANCELSAFE(stdin); ret = _gets_s(buf, n); FUNLOCKFILE_CANCELSAFE(); return (ret); } Index: stable/11/lib/libc/tests/stdio/gets_s_test.c =================================================================== --- stable/11/lib/libc/tests/stdio/gets_s_test.c (revision 335334) +++ stable/11/lib/libc/tests/stdio/gets_s_test.c (revision 335335) @@ -1,145 +1,145 @@ /*- - * Copyright (c) 2017 Cyril S. E. Schubert. All rights reserved. + * Copyright (c) 2017 Cyril S. E. Schubert * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include __FBSDID("$FreeBSD$"); #include #include #include #include #include #include #include #include static errno_t error_code; static const char * message; void h(const char * msg, void * ptr __unused, errno_t error) { error_code = error; message = msg; } /* null ptr */ ATF_TC_WITHOUT_HEAD(null_ptr); ATF_TC_BODY(null_ptr, tc) { ATF_CHECK_MSG(gets_s(NULL, 1) == NULL, "gets_s() failed to handle NULL pointer"); } /* normal */ ATF_TC_WITHOUT_HEAD(normal); ATF_TC_BODY(normal, tc) { pid_t kidpid; int fd[2]; int nfd; // close(STDIN_FILENO); // close(STDOUT_FILENO); pipe(fd); if ((kidpid = fork()) == 0) { char b[10]; close(fd[1]); nfd = dup2(fd[0], 0); close(fd[0]); stdin = fdopen(nfd, "r"); ATF_CHECK_MSG(gets_s(b, sizeof(b)) == 0, "gets_s() normal failed"); fclose(stdin); } else { int stat; close(fd[0]); stdout = fdopen(fd[1], "w"); puts("a sting"); fclose(stdout); (void) waitpid(kidpid, &stat, WEXITED); } } /* n > rmax */ ATF_TC_WITHOUT_HEAD(n_gt_rmax); ATF_TC_BODY(n_gt_rmax, tc) { char b; ATF_CHECK_MSG(gets_s(&b, RSIZE_MAX + 1) == NULL, "gets_s() n > RSIZE_MAX"); } /* n == 0 */ ATF_TC_WITHOUT_HEAD(n_eq_zero); ATF_TC_BODY(n_eq_zero, tc) { char b; ATF_CHECK_MSG(gets_s(&b, 0) == NULL, "gets_s() n is zero"); } /* n > rmax, handler */ ATF_TC_WITHOUT_HEAD(n_gt_rmax_handler); ATF_TC_BODY(n_gt_rmax_handler, tc) { char b; error_code = 0; message = NULL; set_constraint_handler_s(h); ATF_CHECK_MSG(gets_s(&b, RSIZE_MAX + 1) == NULL, "gets_s() n > RSIZE_MAX"); ATF_CHECK_MSG(error_code > 0, "gets_s() error code is %d", error_code); ATF_CHECK_MSG(strcmp(message, "gets_s : n > RSIZE_MAX") == 0, "gets_s(): incorrect error message"); } /* n == 0, handler */ ATF_TC_WITHOUT_HEAD(n_eq_zero_handler); ATF_TC_BODY(n_eq_zero_handler, tc) { char b; error_code = 0; message = NULL; set_constraint_handler_s(h); ATF_CHECK(gets_s(&b, 0) == NULL); ATF_CHECK_MSG(error_code > 0, "gets_s() error code is %d", error_code); ATF_CHECK_MSG(strcmp(message, "gets_s : n == 0") == 0, "gets_s(): incorrect error message"); } ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, null_ptr); ATF_TP_ADD_TC(tp, normal); ATF_TP_ADD_TC(tp, n_gt_rmax); ATF_TP_ADD_TC(tp, n_eq_zero); ATF_TP_ADD_TC(tp, n_gt_rmax_handler); ATF_TP_ADD_TC(tp, n_eq_zero_handler); return (atf_no_error()); } Index: stable/11 =================================================================== --- stable/11 (revision 335334) +++ stable/11 (revision 335335) Property changes on: stable/11 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r333895,334022