[glibc] Resolves: #952799 - Test init_fct for NULL, not result->__init_fct, after demangling (#952799).
Patsy Franklin
pfrankli at fedoraproject.org
Tue Apr 30 14:52:49 UTC 2013
commit 3432a468171ce103480bdb9d9933f93625306ae8
Author: Patsy Franklin <pfrankli at redhat.com>
Date: Tue Apr 30 10:51:37 2013 -0400
Resolves: #952799
- Test init_fct for NULL, not result->__init_fct, after demangling (#952799).
glibc-rh952799.patch | 36 ++++++++++++++++++------------------
glibc.spec | 5 ++++-
2 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/glibc-rh952799.patch b/glibc-rh952799.patch
index b9aba72..9fe22aa 100644
--- a/glibc-rh952799.patch
+++ b/glibc-rh952799.patch
@@ -4,7 +4,7 @@
#
# ChangeLog
#
-#2013-03-21 Patsy Franklin <pfrankli at redhat.com>
+#2013-04-30 Patsy Franklin <pfrankli at redhat.com>
#
# * iconv/gconv_cache.c (find_module): Demangle init_fct before
# checking for NULL. Mangle __btowc_fct if init_fct is non-NULL.
@@ -22,9 +22,9 @@
# for NULL.
#
diff -Nrup a/iconv/gconv_cache.c b/iconv/gconv_cache.c
---- a/iconv/gconv_cache.c 2013-03-20 14:27:37.963273613 -0400
-+++ b/iconv/gconv_cache.c 2013-03-20 14:30:56.705147746 -0400
-@@ -208,17 +208,16 @@ find_module (const char *directory, cons
+--- a/iconv/gconv_cache.c 2012-12-24 22:02:13.000000000 -0500
++++ b/iconv/gconv_cache.c 2013-04-30 06:43:24.788684270 -0400
+@@ -207,17 +207,16 @@ find_module (const char *directory, cons
result->__data = NULL;
/* Call the init function. */
@@ -36,7 +36,7 @@ diff -Nrup a/iconv/gconv_cache.c b/iconv/gconv_cache.c
- PTR_DEMANGLE (init_fct);
+ PTR_DEMANGLE (init_fct);
#endif
-+ if (result->__init_fct != NULL)
++ if (init_fct != NULL)
+ {
status = DL_CALL_FCT (init_fct, (result));
@@ -48,9 +48,9 @@ diff -Nrup a/iconv/gconv_cache.c b/iconv/gconv_cache.c
}
}
diff -Nrup a/iconv/gconv_db.c b/iconv/gconv_db.c
---- a/iconv/gconv_db.c 2013-03-20 14:27:37.963273613 -0400
-+++ b/iconv/gconv_db.c 2013-03-21 18:19:28.527148765 -0400
-@@ -180,16 +180,15 @@ free_derivation (void *p)
+--- a/iconv/gconv_db.c 2012-12-24 22:02:13.000000000 -0500
++++ b/iconv/gconv_db.c 2013-04-30 06:37:16.886521576 -0400
+@@ -179,16 +179,15 @@ free_derivation (void *p)
size_t cnt;
for (cnt = 0; cnt < deriv->nsteps; ++cnt)
@@ -71,7 +71,7 @@ diff -Nrup a/iconv/gconv_db.c b/iconv/gconv_db.c
}
/* Free the name strings. */
-@@ -210,16 +209,12 @@ __gconv_release_step (struct __gconv_ste
+@@ -212,16 +211,12 @@ __gconv_release_step (struct __gconv_ste
if (step->__shlib_handle != NULL && --step->__counter == 0)
{
/* Call the destructor. */
@@ -92,7 +92,7 @@ diff -Nrup a/iconv/gconv_db.c b/iconv/gconv_db.c
#ifndef STATIC_GCONV
/* Release the loaded module. */
-@@ -291,13 +286,11 @@ gen_steps (struct derivation_step *best,
+@@ -293,13 +288,11 @@ gen_steps (struct derivation_step *best,
/* Call the init function. */
__gconv_init_fct init_fct = result[step_cnt].__init_fct;
@@ -109,7 +109,7 @@ diff -Nrup a/iconv/gconv_db.c b/iconv/gconv_db.c
status = DL_CALL_FCT (init_fct, (&result[step_cnt]));
if (__builtin_expect (status, __GCONV_OK) != __GCONV_OK)
-@@ -310,8 +303,7 @@ gen_steps (struct derivation_step *best,
+@@ -312,8 +305,7 @@ gen_steps (struct derivation_step *best,
}
# ifdef PTR_MANGLE
@@ -119,7 +119,7 @@ diff -Nrup a/iconv/gconv_db.c b/iconv/gconv_db.c
# endif
}
}
-@@ -391,16 +383,15 @@ increment_counter (struct __gconv_step *
+@@ -393,16 +385,15 @@ increment_counter (struct __gconv_step *
/* Call the init function. */
__gconv_init_fct init_fct = step->__init_fct;
@@ -141,9 +141,9 @@ diff -Nrup a/iconv/gconv_db.c b/iconv/gconv_db.c
}
}
diff -Nrup a/iconv/gconv_dl.c b/iconv/gconv_dl.c
---- a/iconv/gconv_dl.c 2005-12-19 02:23:44.000000000 -0500
-+++ b/iconv/gconv_dl.c 2013-03-20 14:30:56.707148662 -0400
-@@ -133,10 +133,8 @@ __gconv_find_shlib (const char *name)
+--- a/iconv/gconv_dl.c 2012-12-24 22:02:13.000000000 -0500
++++ b/iconv/gconv_dl.c 2013-04-30 06:37:16.889521601 -0400
+@@ -132,10 +132,8 @@ __gconv_find_shlib (const char *name)
#ifdef PTR_MANGLE
PTR_MANGLE (found->fct);
@@ -157,9 +157,9 @@ diff -Nrup a/iconv/gconv_dl.c b/iconv/gconv_dl.c
/* We have succeeded in loading the shared object. */
diff -Nrup a/wcsmbs/btowc.c b/wcsmbs/btowc.c
---- a/wcsmbs/btowc.c 2005-12-19 02:24:47.000000000 -0500
-+++ b/wcsmbs/btowc.c 2013-03-21 18:20:35.590148608 -0400
-@@ -48,15 +48,15 @@ __btowc (c)
+--- a/wcsmbs/btowc.c 2012-12-24 22:02:13.000000000 -0500
++++ b/wcsmbs/btowc.c 2013-04-30 06:37:16.891521619 -0400
+@@ -47,15 +47,15 @@ __btowc (c)
/* Get the conversion functions. */
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
__gconv_btowc_fct btowc_fct = fcts->towc->__btowc_fct;
diff --git a/glibc.spec b/glibc.spec
index f44847e..af608e9 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
-Release: 6%{?dist}
+Release: 7%{?dist}
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1211,6 +1211,9 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Apr 23 2013 Patsy Franklin <pfrankli at redhat.com> - 2.17-7
+ - Test init_fct for NULL, not result->__init_fct, after demangling (#952799).
+
* Tue Apr 23 2013 Patsy Franklin <pfrankli at redhat.com> - 2.17-6
- Increase limits on xdr name and record requests (#892777).
- Consistently MANGLE/DEMANGLE init_fct, end_fct and btow_fct (#952799).
More information about the scm-commits
mailing list