Attachment 115221 Details for Bug 89595 – log-iter-xml: Fix crash when logs are corrupted or invalid XML

[patch] log-iter-xml: Fix crash when logs are corrupted or invalid XML

0003-log-iter-xml-Fix-crash-when-logs-are-corrupted-or-in.patch (text/plain), 1.33 KB, created by Debarshi Ray on 2015-04-20 12:18:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Debarshi Ray

Created: 2015-04-20 12:18:15 UTC

Size: 1.33 KB

patch

obsolete

>From edf1ced4aeb174c411d5f3b0b38453f5f00666c1 Mon Sep 17 00:00:00 2001
>From: Debarshi Ray <debarshir@freedesktop.org>
>Date: Fri, 17 Apr 2015 18:28:20 +0200
>Subject: [PATCH 3/3] log-iter-xml: Fix crash when logs are corrupted or
> invalid XML
>
>Chances of _tpl_log_store_get_events_for_date returning NULL due to an
>invalid XML file are lower because we ask libxml2 (since commit
>734af80691) to recover from errors if possible. Even then, it doesn't
>hurt to defend against this eventuality.
>
>Thanks to Daniel Thompson for catching this!
>
>https://bugs.freedesktop.org/show_bug.cgi?id=89595
>---
> telepathy-logger/log-iter-xml.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/telepathy-logger/log-iter-xml.c b/telepathy-logger/log-iter-xml.c
>index 1684a74..df531e4 100644
>--- a/telepathy-logger/log-iter-xml.c
>+++ b/telepathy-logger/log-iter-xml.c
>@@ -81,8 +81,12 @@ tpl_log_iter_xml_get_events (TplLogIter *iter,
>               priv->account, priv->target, priv->type_mask,
>               (GDate *) priv->next_date->data);
> 
>-          priv->next_event = g_list_last (priv->events);
>           priv->next_date = g_list_previous (priv->next_date);
>+
>+          if (priv->events == NULL)
>+            continue;
>+
>+          priv->next_event = g_list_last (priv->events);
>         }
> 
>       event = TPL_EVENT (priv->next_event->data);
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 89595: 114349 | 115213 | 115217 | 115218 | 115219 | 115220 | 115221

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.