lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* misc/tsearch.c (__tdelete): Remove unnecessary test

Browse Source 
[Coverity CID 75].

	* sysdeps/generic/unwind-dw2.c (execute_cfa_program): Print error
	message for invalid DWARF data instead of crashing.
This commit is contained in:
Ulrich Drepper
2006-05-02 00:50:46 +00:00
parent 1e528c6e1b
commit afbf86d209
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2006-05-01 Ulrich Drepper <drepper@redhat.com> 2006-05-01 Ulrich Drepper <drepper@redhat.com>
* misc/tsearch.c (__tdelete): Remove unnecessary test
[Coverity CID 75].
* sysdeps/generic/unwind-dw2.c (execute_cfa_program): Print error
message for invalid DWARF data instead of crashing.
* nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r): Don't try to * nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r): Don't try to
free outkey in error case when batch_read is set. free outkey in error case when batch_read is set.

4
misc/tsearch.c
View File

@ -447,7 +447,7 @@ __tdelete (const void *key, void **vrootp, __compar_fn_t compar)
/* Q is R's brother, P is R's parent. The subtree with root /* Q is R's brother, P is R's parent. The subtree with root
R has one black edge less than the subtree with root Q. */ R has one black edge less than the subtree with root Q. */
q = p->right; q = p->right;
if (q != NULL && q->red) if (q->red)
{ {
/* If Q is red, we know that P is black. We rotate P left /* If Q is red, we know that P is black. We rotate P left
so that Q becomes the top node in the tree, with P below so that Q becomes the top node in the tree, with P below
@ -535,7 +535,7 @@ __tdelete (const void *key, void **vrootp, __compar_fn_t compar)
{ {
/* Comments: see above. */ /* Comments: see above. */
q = p->left; q = p->left;
if (q != NULL && q->red) if (q->red)
{ {
q->red = 0; q->red = 0;
p->red = 1; p->red = 1;

14
sysdeps/generic/unwind-dw2.c
View File

@ -25,6 +25,7 @@
#include <error.h> #include <error.h>
#include <libintl.h> #include <libintl.h>
#include <dwarf2.h> #include <dwarf2.h>
#include <stdio.h>
#include <unwind.h> #include <unwind.h>
#include <unwind-pe.h> #include <unwind-pe.h>
#include <unwind-dw2-fde.h> #include <unwind-dw2-fde.h>
@ -837,9 +838,16 @@ execute_cfa_program (const unsigned char *insn_ptr,
case DW_CFA_restore_state: case DW_CFA_restore_state:
{ {
struct frame_state_reg_info *old_rs = fs->regs.prev; struct frame_state_reg_info *old_rs = fs->regs.prev;
fs->regs = *old_rs; #ifdef _LIBC
old_rs->prev = unused_rs; if (old_rs == NULL)
unused_rs = old_rs; __libc_fatal ("invalid DWARF unwind data");
else
#endif
{
fs->regs = *old_rs;
old_rs->prev = unused_rs;
unused_rs = old_rs;
}
} }
break; break;