From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31516 invoked by alias); 11 Mar 2004 12:26:27 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 31486 invoked from network); 11 Mar 2004 12:26:26 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.19.66) by sources.redhat.com with SMTP; 11 Mar 2004 12:26:26 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i2BAHFnd003016; Thu, 11 Mar 2004 11:17:15 +0100 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i2BAHFI6003014; Thu, 11 Mar 2004 11:17:15 +0100 Date: Thu, 11 Mar 2004 12:26:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix NPTL forward.c Message-ID: <20040311101715.GE3822@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2004-03/txt/msg00067.txt.bz2 Hi! While FORWARD macro has default return value as last argument, FORWARD2 has default action. With defaction 0 we end up with: if (someptr == NULL) 0; (*someptr) (arguments); which will segfault if libpthread.so is not loaded. 2004-03-11 Jakub Jelinek * forward.c (__pthread_cond_broadcast_2_0, __pthread_cond_destroy_2_0, __pthread_cond_init_2_0, __pthread_cond_signal_2_0, __pthread_cond_wait_2_0, __pthread_cond_timedwait_2_0): Use return 0 as defaction instead of 0. --- libc/nptl/forward.c.jj 2004-03-10 10:32:00.000000000 +0100 +++ libc/nptl/forward.c 2004-03-11 12:03:14.211544646 +0100 @@ -89,7 +89,7 @@ FORWARD (pthread_condattr_init, (pthread #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) FORWARD2 (__pthread_cond_broadcast_2_0, int attribute_compat_text_section, - (pthread_cond_2_0_t *cond), (cond), 0) + (pthread_cond_2_0_t *cond), (cond), return 0) compat_symbol (libc, __pthread_cond_broadcast_2_0, pthread_cond_broadcast, GLIBC_2_0); #endif @@ -99,7 +99,7 @@ versioned_symbol (libc, __pthread_cond_b #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) FORWARD2 (__pthread_cond_destroy_2_0, int attribute_compat_text_section, - (pthread_cond_2_0_t *cond), (cond), 0) + (pthread_cond_2_0_t *cond), (cond), return 0) compat_symbol (libc, __pthread_cond_destroy_2_0, pthread_cond_destroy, GLIBC_2_0); #endif @@ -110,7 +110,7 @@ versioned_symbol (libc, __pthread_cond_d #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) FORWARD2 (__pthread_cond_init_2_0, int attribute_compat_text_section, (pthread_cond_2_0_t *cond, const pthread_condattr_t *cond_attr), - (cond, cond_attr), 0) + (cond, cond_attr), return 0) compat_symbol (libc, __pthread_cond_init_2_0, pthread_cond_init, GLIBC_2_0); #endif FORWARD (__pthread_cond_init, @@ -120,7 +120,7 @@ versioned_symbol (libc, __pthread_cond_i #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) FORWARD2 (__pthread_cond_signal_2_0, int attribute_compat_text_section, - (pthread_cond_2_0_t *cond), (cond), 0) + (pthread_cond_2_0_t *cond), (cond), return 0) compat_symbol (libc, __pthread_cond_signal_2_0, pthread_cond_signal, GLIBC_2_0); #endif @@ -130,7 +130,8 @@ versioned_symbol (libc, __pthread_cond_s #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) FORWARD2 (__pthread_cond_wait_2_0, int attribute_compat_text_section, - (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex), 0) + (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex), (cond, mutex), + return 0) compat_symbol (libc, __pthread_cond_wait_2_0, pthread_cond_wait, GLIBC_2_0); #endif @@ -142,7 +143,8 @@ versioned_symbol (libc, __pthread_cond_w #if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3_2) FORWARD2 (__pthread_cond_timedwait_2_0, int attribute_compat_text_section, (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex, - const struct timespec *abstime), (cond, mutex, abstime), 0) + const struct timespec *abstime), (cond, mutex, abstime), + return 0) compat_symbol (libc, __pthread_cond_timedwait_2_0, pthread_cond_timedwait, GLIBC_2_0); #endif Jakub