AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 12:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix locking problem in fmtmsg

Browse Source
This commit is contained in:
Ulrich Drepper 2012-01-16 09:03:20 -05:00
parent e0a309cf2a
commit 400aa020ea
4 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2012-01-16 Ulrich Drepper <drepper@gmail.com>
* stdlib/Makefile (tests): Add bug-fmtmsg1.
* stdlib/bug-fmtmsg1.c: New file.
* stdlib/fmtmsg.c (init): Add missing unlock.
Patch by Peng Haitao <penght@cn.fujitsu.com>.
2012-01-12 Marek Polacek <polacek@redhat.com> 2012-01-12 Marek Polacek <polacek@redhat.com>
* libio/bits/stdio2.h: Do not define gets for ISO C11, ISO C++11, * libio/bits/stdio2.h: Do not define gets for ISO C11, ISO C++11,

5
stdlib/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1991-2009, 2011 Free Software Foundation, Inc. # Copyright (C) 1991-2009, 2011, 2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library. # This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or # The GNU C Library is free software; you can redistribute it and/or
@ -71,7 +71,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \
tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \ tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \ tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \
tst-makecontext2 tst-strtod6 tst-unsetenv1 \ tst-makecontext2 tst-strtod6 tst-unsetenv1 \
tst-makecontext3 bug-getcontext tst-makecontext3 bug-getcontext bug-fmtmsg1
include ../Makeconfig include ../Makeconfig
@ -121,6 +121,7 @@ tst-strtod3-ENV = LOCPATH=$(common-objpfx)localedata
tst-strtod4-ENV = LOCPATH=$(common-objpfx)localedata tst-strtod4-ENV = LOCPATH=$(common-objpfx)localedata
tst-strtod5-ENV = LOCPATH=$(common-objpfx)localedata tst-strtod5-ENV = LOCPATH=$(common-objpfx)localedata
testmb2-ENV = LOCPATH=$(common-objpfx)localedata testmb2-ENV = LOCPATH=$(common-objpfx)localedata
bug-fmtmsg1-ENV = SEV_LEVEL=foo,11,newsev
# Run a test on the header files we use. # Run a test on the header files we use.
tests: $(objpfx)isomac.out tests: $(objpfx)isomac.out

28
stdlib/bug-fmtmsg1.c Normal file
View File

@ -0,0 +1,28 @@
#include <fmtmsg.h>
#include <stdio.h>
static int
do_test (void)
{
/* Ugly, but fmtmsg would otherwise print to stderr which we do not
want. */
fclose (stderr);
stderr = stdout;
int e1;
e1 = fmtmsg (MM_PRINT, "label:part", MM_WARNING, "text", "action", "tag");
int e2;
e2 = fmtmsg (MM_PRINT, "label2:part2", 11, "text2", "action2", "tag2");
addseverity (10, "additional severity");
int e3;
e3 = fmtmsg (MM_PRINT, "label3:part3", 10, "text3", "action3", "tag3");
return e1 != 0 || e2 != 0 || e3 != 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

5
stdlib/fmtmsg.c
View File

@ -1,4 +1,5 @@
/* Copyright (C) 1997,1999-2003,2005,2006,2011 Free Software Foundation, Inc. /* Copyright (C) 1997,1999-2003,2005,2006,2011,2012
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@ -280,6 +281,8 @@ init (void)
sevlevel_var = end + (*end == ':' ? 1 : 0); sevlevel_var = end + (*end == ':' ? 1 : 0);
} }
__libc_lock_unlock (lock);
} }
} }