From fda17c20a3d088fccab1671c8881bd217d83d5f6 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 11 Nov 2014 22:30:14 -0500 Subject: [PATCH] Fix strerror error handling when given a non-integer argument. Fixes . Reported and fixed by Glenn Michaels . * libguile/error.c (scm_strerror): Convert the argument to a C integer outside of the critical section, to avoid deadlock on error. * THANKS: Add Glenn Michaels to the fixes section. --- THANKS | 1 + libguile/error.c | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/THANKS b/THANKS index 1aeb4a429..d5e8222fb 100644 --- a/THANKS +++ b/THANKS @@ -134,6 +134,7 @@ For fixes or providing information which led to a fix: Dan McMahill Roger Mc Murtrie Scott McPeak + Glenn Michaels Andrew Milkowski Tim Mooney Han-Wen Nienhuys diff --git a/libguile/error.c b/libguile/error.c index b5565a069..7971046ce 100644 --- a/libguile/error.c +++ b/libguile/error.c @@ -1,5 +1,5 @@ -/* Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2004, 2006, 2010, - * 2012, 2013, 2014 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998, 2000, 2001, 2004, 2006, 2010, 2012-2014 + * 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 @@ -121,10 +121,13 @@ SCM_DEFINE (scm_strerror, "strerror", 1, 0, 0, #define FUNC_NAME s_scm_strerror { SCM ret; + int errnum = scm_to_int (err); /* Must be done outside of the + critical section below, to avoid a + deadlock on errors. */ scm_dynwind_begin (0); scm_i_dynwind_pthread_mutex_lock (&scm_i_misc_mutex); - ret = scm_from_locale_string (strerror (scm_to_int (err))); + ret = scm_from_locale_string (strerror (errnum)); scm_dynwind_end (); return ret;