Gentoo Archives: gentoo-commits

From: "Mart Raudsepp (leio)" <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/rarian/files: rarian-0.6.0-reg-return.patch digest-rarian-0.6.0-r1
Date: Tue, 23 Oct 2007 18:33:35
Message-Id: E1IkOZF-0006gZ-QI@stork.gentoo.org
1 leio 07/10/23 18:33:29
2
3 Added: rarian-0.6.0-reg-return.patch
4 digest-rarian-0.6.0-r1
5 Log:
6 Fix memory clobbering leading to outright crash on at least sparc and ia64
7 (Portage version: 2.1.3.15)
8
9 Revision Changes Path
10 1.1 app-text/rarian/files/rarian-0.6.0-reg-return.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/rarian/files/rarian-0.6.0-reg-return.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/rarian/files/rarian-0.6.0-reg-return.patch?rev=1.1&content-type=text/plain
14
15 Index: rarian-0.6.0-reg-return.patch
16 ===================================================================
17 Patch from comment #2 on https://bugs.freedesktop.org/show_bug.cgi?id=12279
18 Fixes crash on sparc and ia64 and might fix weird issues on other arches as this is about memory clobbering
19
20 --- rarian-0.6.0.old/librarian/rarian-reg-full.c 2007-10-16 16:33:02.685297000 +0100
21 +++ rarian-0.6.0/librarian/rarian-reg-full.c 2007-10-16 16:38:24.553412000 +0100
22 @@ -59,6 +59,8 @@
23 reg->heritage = NULL;
24 reg->lang = NULL;
25 reg->children = NULL;
26 +
27 + return (reg);
28 }
29
30 RrnRegFull *
31 --- rarian-0.6.0.old/librarian/rarian-reg-utils.c 2007-10-16 16:33:02.683296000 +0100
32 +++ rarian-0.6.0/librarian/rarian-reg-utils.c 2007-10-16 16:38:43.173230000 +0100
33 @@ -36,7 +36,7 @@
34 static void process_sect_pair (RrnSect *sect, char *key, char *value);
35 static int rrn_reg_add_sect (RrnReg *reg, RrnSect *sect);
36 static void process_path (RrnReg *reg);
37 -static char * process_section_path (char *owner_path, RrnSect *section);
38 +static void process_section_path (char *owner_path, RrnSect *section);
39
40
41 RrnReg *
42 @@ -58,6 +58,8 @@
43 reg->lang = NULL;
44 reg->ghelp_name = NULL;
45 reg->children = NULL;
46 +
47 + return (reg);
48 }
49
50 RrnReg *
51 @@ -748,7 +750,7 @@
52
53 }
54
55 -static char *
56 +static void
57 process_section_path (char *owner_path, RrnSect *section)
58 {
59 char *tmp = NULL;
60 --- rarian-0.6.0.old/librarian/rarian-info.c 2007-10-16 16:33:02.684297000 +0100
61 +++ rarian-0.6.0/librarian/rarian-info.c 2007-10-16 16:37:02.125582000 +0100
62 @@ -614,13 +614,13 @@
63 if (!section || (*section && l->reg->section && !strcmp (l->reg->section, section))) {
64 return l->reg;
65 } else {
66 - best_result = l->reg;
67 + best_result = l;
68 }
69 }
70 l = l->next;
71 }
72
73 - return best_result;
74 + return best_result->reg;
75
76 }
77
78
79
80
81 1.1 app-text/rarian/files/digest-rarian-0.6.0-r1
82
83 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/rarian/files/digest-rarian-0.6.0-r1?rev=1.1&view=markup
84 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-text/rarian/files/digest-rarian-0.6.0-r1?rev=1.1&content-type=text/plain
85
86 Index: digest-rarian-0.6.0-r1
87 ===================================================================
88 MD5 23772a3b0f882d13c86dd9fa67bb21bf rarian-0.6.0.tar.bz2 312258
89 RMD160 167c02f58e493c624d0eedb1137928c7a7cc452a rarian-0.6.0.tar.bz2 312258
90 SHA256 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029 rarian-0.6.0.tar.bz2 312258
91
92
93
94 --
95 gentoo-commits@g.o mailing list