mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-30 00:40:20 +02:00
Code Activity

Make sure the return value of 'scm_crypt' is always initialized.

Browse source 
* libguile/posix.c (scm_crypt): Always initialize 'ret'; error out even
when ERR is zero.
This commit is contained in:
Ludovic Courtès 2018-01-10 16:19:09 +01:00
parent 988aa29238
commit cc8f41e7d8
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libguile/posix.c
View file

@ -1,6 +1,6 @@
/* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, /* Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
* 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, * 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013,
* 2014, 2016, 2017 Free Software Foundation, Inc. * 2014, 2016, 2017, 2018 Free Software Foundation, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License * modify it under the terms of the GNU Lesser General Public License
@ -1955,9 +1955,12 @@ SCM_DEFINE (scm_crypt, "crypt", 2, 0, 0,
c_ret = crypt (c_key, c_salt); c_ret = crypt (c_key, c_salt);
if (c_ret == NULL) if (c_ret == NULL)
/* Note: Do not throw until we've released 'scm_i_misc_mutex' since {
this would cause a deadlock down the path. */ /* Note: Do not throw until we've released 'scm_i_misc_mutex'
err = errno; since this would cause a deadlock down the path. */
err = errno;
ret = SCM_BOOL_F;
}
else else
{ {
err = 0; err = 0;
@ -1966,7 +1969,7 @@ SCM_DEFINE (scm_crypt, "crypt", 2, 0, 0,
scm_dynwind_end (); scm_dynwind_end ();
if (err != 0) if (scm_is_false (ret))
{ {
errno = err; errno = err;
SCM_SYSERROR; SCM_SYSERROR;