lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Pass back error code from dlerror_run

Browse Source
This commit is contained in:
Ulrich Drepper
2011-09-07 23:50:40 -04:00
parent c966526aa4
commit fdc86bc9a8
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2011-09-07 Ulrich Drepper <drepper@gmail.com> 2011-09-07 Ulrich Drepper <drepper@gmail.com>
* elf/dl-libc.c (dlerror_run): Pass back error code from
dl_catch_error.
[BZ #13123] [BZ #13123]
* elf/dl-load.c (lose): Free l_origin if it is valid. * elf/dl-load.c (lose): Free l_origin if it is valid.

6
elf/dl-libc.c
View File

@ -45,10 +45,10 @@ dlerror_run (void (*operate) (void *), void *args)
const char *last_errstring = NULL; const char *last_errstring = NULL;
bool malloced; bool malloced;
(void) GLRO(dl_catch_error) (&objname, &last_errstring, &malloced, int result = (GLRO(dl_catch_error) (&objname, &last_errstring, &malloced,
operate, args); operate, args)
?: last_errstring != NULL);
int result = last_errstring != NULL;
if (result && malloced) if (result && malloced)
free ((char *) last_errstring); free ((char *) last_errstring);