Re: [patch] Fix for PR gdb/10819

[Paul Pluzhnikov <ppluzhnikov@google.com>]

[-- Attachment #1: Type: text/plain, Size: 512 bytes --]

On Wed, Oct 21, 2009 at 10:47 PM, Jan Kratochvil
<jan.kratochvil@redhat.com> wrote:

> I would find appropriate there a comment it is a Solaris bug workaround, the
> condition looks to me as clearly redundant there now.

Comment added.

Should this patch (if approved) also go into gdb-7.0 branch?
(It is clearly very safe.)

Thanks,
-- 
Paul Pluzhnikov

2009-10-22  Paul Pluzhnikov  <ppluzhnikov@google.com>

       PR gdb/10819
       * dwarf2-frame.c (find_cie): Don't call bsearch on
       empty cie_table.

[-- Attachment #2: gdb-pr10819-20091022.txt --]
[-- Type: text/plain, Size: 620 bytes --]

--- dwarf2-frame.c.orig	2009-10-21 21:34:20.000000000 -0700
+++ dwarf2-frame.c	2009-10-21 23:10:29.000000000 -0700
@@ -1525,6 +1525,14 @@ find_cie (struct dwarf2_cie_table *cie_t
 {
   struct dwarf2_cie **p_cie;
 
+  if (cie_table->num_entries == 0)
+    {
+      /* On Solaris 8 bsearch may call comparison function even when given
+	 an empty table.  As a work around, don't call bsearch under these
+	 conditions.  */
+      return NULL;
+    }
+
   p_cie = bsearch (&cie_pointer, cie_table->entries, cie_table->num_entries,
                    sizeof (cie_table->entries[0]), bsearch_cie_cmp);
   if (p_cie != NULL)