mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 09:10:22 +02:00
Code Activity

Fix list validation of *list->bytevector procedures.

Browse source 
Fixes <https://bugs.gnu.org/32938>.
Reported by Josh Datko <jbd@cryptotronix.com>.

* libguile/validate.h (SCM_VALIDATE_LIST_COPYLEN)
(SCM_VALIDATE_NONEMPTYLIST_COPYLEN): Use '!=' instead of '>=' to
validate the result of 'scm_ilength' after it has been stored in
the user variable 'cvar'.
* test-suite/tests/bytevectors.test: Add tests.  Use '#:use-module'
instead of ':use-module' in 'define-module' form.
This commit is contained in:
Mark H Weaver 2018-10-14 02:22:22 -04:00
parent b44f505f15
commit fe73fedab4
2 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/validate.h
View file

@ -3,8 +3,8 @@
#ifndef SCM_VALIDATE_H
#define SCM_VALIDATE_H
/* Copyright (C) 1999, 2000, 2001, 2002, 2004, 2006, 2007, 2009,
* 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
/* Copyright (C) 1999-2002, 2004, 2006, 2007, 2009, 2011-2014,
* 2018 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@ -255,16 +255,20 @@
SCM_ASSERT (scm_ilength (lst) > 0, lst, pos, FUNC_NAME); \
} while (0)
/* Note: we use (cvar != -1) instead of (cvar >= 0) below
in case 'cvar' is of unsigned type. */
#define SCM_VALIDATE_LIST_COPYLEN(pos, lst, cvar) \
do { \
cvar = scm_ilength (lst); \
SCM_ASSERT (cvar >= 0, lst, pos, FUNC_NAME); \
SCM_ASSERT (cvar != -1, lst, pos, FUNC_NAME); \
} while (0)
/* Note: we use (cvar != -1 && cvar != 0) instead of
(cvar >= 1) below in case 'cvar' is of unsigned type. */
#define SCM_VALIDATE_NONEMPTYLIST_COPYLEN(pos, lst, cvar) \
do { \
cvar = scm_ilength (lst); \
SCM_ASSERT (cvar >= 1, lst, pos, FUNC_NAME); \
SCM_ASSERT (cvar != -1 && cvar != 0, lst, pos, FUNC_NAME); \
} while (0)
#define SCM_VALIDATE_ALISTCELL(pos, alist) \