Package: aegis / 4.24.3-3

sf-3066593-fix.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
MIME-Version: 1.0
Content-Type: application/aegis-patch
Subject: aegis.4.24 - [ SF#3066593 ] aecp segfault
Content-Name: aegis.4.24.C518.patch
Content-Disposition: attachment; filename=aegis.4.24.C518.patch
X-Aegis-Project-Name: aegis.4.24
X-Aegis-Change-Number: 518

#	
#	A segfault in the roll_forward code has been fixed, it caused problems
#	to aecp -ind.
#	
#	My thanks to Stefan Fritsch for reporting the problem.
#	
# Aegis-Change-Set-Begin
# QlpoMzFBWSZTWVB6p4QAAGNfgAAQWAf/6iECCA6//9/qMAFapNBqp4NU9BomTanpGQNMBA0M
# g1QGiemCTTE0wBDBGExBKmRMIKfomJogeo9IGjJ6hob8EfgH6jGdaUBy8Pg04M1aqix55JpT
# rCTSPGmidDX6rVGrPvBCEiTgw7gLNI4sartfwg+xc93jC2vyywlIVHiLyPGdEa/extPtohbs
# Q7e5zdoMXkvFBG5i97ll931NpRwsaZ1vBzaM1sMa1AMTEjqHpIeWWSsBsRf1fSTlSoaDgzYF
# IEx/bH2A9e2DfU4dqPxGmjTKPpaUtiSCmPo8vUbdKS5AqsXBmXCuLUxOm5xAtvxSUgxsihbC
# c8x9r4MMIFz62x39TpEzaZ3QEfaKvOtoUMcseg6zBwPfcUGGSsIAl864gcBioEbyxQ24pAjd
# h7GH06ViIN1C4e5UpJChdiUkblueCWMlEnlEJenZLJK2ZVVlTga4xnUXyUS1XkGh/bnn+LuS
# KcKEgoPVPCA=
# Aegis-Change-Set-End
#
Index: aegis.git/libaegis/project/file/roll_forward.cc
===================================================================
--- aegis.git.orig/libaegis/project/file/roll_forward.cc	2010-09-17 08:02:02.000000000 +0200
+++ aegis.git/libaegis/project/file/roll_forward.cc	2010-09-17 08:02:08.000000000 +0200
@@ -1045,17 +1045,19 @@
                 //
                 file_event_list::pointer felp2 =
                     uuid_to_felp.get(nstring(filename));
-                assert(felp2);
-                felp2->push_back(*result);
-
-                //
-                // Make sure the by-uuid and by-filename lookups will
-                // both be the same from now on.
-                //
-                uuid_to_felp.assign(uuid, felp2);
-                result = uuid_to_felp.get(uuid);
-                assert(result);
-                assert(result == felp2);
+                if (felp2)
+                {
+                    felp2->push_back(*result);
+
+                    //
+                    // Make sure the by-uuid and by-filename lookups will
+                    // both be the same from now on.
+                    //
+                    uuid_to_felp.assign(uuid, felp2);
+                    result = uuid_to_felp.get(uuid);
+                    assert(result);
+                    assert(result == felp2);
+                }
             }
         }