Attachment 12075 Details for Bug 12279 – Fix Crash Again

[patch] Fix Crash Again

rarian-01-reg-return.diff (text/plain), 1.52 KB, created by Matt Keenan on 2007-10-16 08:55:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Keenan

Created: 2007-10-16 08:55:07 UTC

Size: 1.52 KB

patch

obsolete

>--- rarian-0.6.0.old/librarian/rarian-reg-full.c	2007-10-16 16:33:02.685297000 +0100
>+++ rarian-0.6.0/librarian/rarian-reg-full.c	2007-10-16 16:38:24.553412000 +0100
>@@ -59,6 +59,8 @@
>     reg->heritage    = NULL;
>     reg->lang = NULL;
>     reg->children = NULL;
>+	
>+	return (reg);
> }
> 
> RrnRegFull *
>--- rarian-0.6.0.old/librarian/rarian-reg-utils.c	2007-10-16 16:33:02.683296000 +0100
>+++ rarian-0.6.0/librarian/rarian-reg-utils.c	2007-10-16 16:38:43.173230000 +0100
>@@ -36,7 +36,7 @@
> static void     process_sect_pair (RrnSect *sect, char *key, char *value);
> static int      rrn_reg_add_sect (RrnReg *reg, RrnSect *sect);
> static void     process_path (RrnReg *reg);
>-static char *   process_section_path (char *owner_path, RrnSect *section);
>+static void     process_section_path (char *owner_path, RrnSect *section);
> 
> 
> RrnReg *
>@@ -58,6 +58,8 @@
>     reg->lang = NULL;
>     reg->ghelp_name = NULL;
>     reg->children = NULL;
>+
>+	return (reg);
> }
> 
> RrnReg *
>@@ -748,7 +750,7 @@
> 
> }
> 
>-static char *
>+static void
> process_section_path (char *owner_path, RrnSect *section)
> {
> 	char *tmp = NULL;
>--- rarian-0.6.0.old/librarian/rarian-info.c	2007-10-16 16:33:02.684297000 +0100
>+++ rarian-0.6.0/librarian/rarian-info.c	2007-10-16 16:37:02.125582000 +0100
>@@ -614,13 +614,13 @@
>       if (!section || (*section && l->reg->section && !strcmp (l->reg->section, section))) {
> 	return l->reg;
>       } else {
>-	best_result = l->reg;
>+	best_result = l;
>       }
>     }
>     l = l->next;
>   }
>   
>-  return best_result;
>+  return best_result->reg;
> 
> }
>

Actions: View | Splinter Review

Attachments on bug 12279: 12074 | 12075

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.