[interchange-cvs] interchange - racke modified lib/Vend/Config.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Fri Aug 2 09:10:02 2002
User: racke
Date: 2002-08-02 13:09:35 GMT
Modified: lib/Vend Config.pm
Log:
merged changes 2.2.2.9 vs 2.2.2.10
+++ 2.2.2.10 +++
Pass the locale name instead of the locale settings in
Vend::Config::parse_locales() to POSIX::setlocale.
This bug was discovered due to a buffer overflow in the FreeBSD C
library. Thanks to Joachim Leidinger for reporting and pursuing
this problem and Alexander Leidinger for debugging.
Revision Changes Path
2.59 +3 -3 interchange/lib/Vend/Config.pm
rev 2.59, prev_rev 2.58
Index: Config.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.58
retrieving revision 2.59
diff -u -r2.58 -r2.59
--- Config.pm 2 Aug 2002 13:04:09 -0000 2.58
+++ Config.pm 2 Aug 2002 13:09:34 -0000 2.59
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.58 2002/08/02 13:04:09 racke Exp $
+# $Id: Config.pm,v 2.59 2002/08/02 13:09:34 racke Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -44,7 +44,7 @@
use Vend::Parse;
use Vend::Util;
=20
-$VERSION =3D substr(q$Revision: 2.58 $, 10);
+$VERSION =3D substr(q$Revision: 2.59 $, 10);
=20
my %CDname;
=20
@@ -1859,7 +1859,7 @@
and $eval =3D 1;
$eval and ! $safe and $safe =3D new Safe;
if(! defined $store->{$name} and $item eq 'Locale') {
- if(POSIX::setlocale(POSIX::LC_ALL, $settings) ) {
+ if(POSIX::setlocale(POSIX::LC_ALL, $name) ) {
$store->{$name} =3D POSIX::localeconv();
}
}