From fa978bdd2c3a576df357ce7905b11b73810dc100 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Fri, 20 Jun 2014 20:42:00 +0200
Subject: [SATYR PATCH 2/6] Fix the compat version of duphash generation

sr_thread_get_duphash() must return NULL for oopses having no reliable
frame.

Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
 lib/generic_thread.c      |  7 +++-
 tests/koops_frame.at      |  1 -
 tests/koops_stacktrace.at | 83 +++++++++++++++++++++++++++++++++++++++++++++++
 tests/python/koops.py     |  1 +
 4 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/lib/generic_thread.c b/lib/generic_thread.c
index b219f26..59fff1b 100644
--- a/lib/generic_thread.c
+++ b/lib/generic_thread.c
@@ -262,7 +262,12 @@ sr_thread_get_duphash(struct sr_thread *thread, int nframes, char *prefix,
             nframes--;
     }
 
-    if (flags & SR_DUPHASH_NOHASH)
+    if ((flags & SR_DUPHASH_KOOPS_COMPAT) && strbuf->len == 0)
+    {
+        sr_strbuf_free(strbuf);
+        ret = NULL;
+    }
+    else if (flags & SR_DUPHASH_NOHASH)
         ret = sr_strbuf_free_nobuf(strbuf);
     else
     {
diff --git a/tests/koops_frame.at b/tests/koops_frame.at
index be2cb11..4abc32a 100644
--- a/tests/koops_frame.at
+++ b/tests/koops_frame.at
@@ -288,4 +288,3 @@ main(void)
   return 0;
 }
 ]])
-
diff --git a/tests/koops_stacktrace.at b/tests/koops_stacktrace.at
index 404d53c..5e17ca7 100644
--- a/tests/koops_stacktrace.at
+++ b/tests/koops_stacktrace.at
@@ -730,3 +730,86 @@ main(void)
   return 0;
 }
 ]])
+
+## --------------------- ##
+## sr_thread_get_duphash ##
+## --------------------- ##
+
+AT_TESTFUN([sr_thread_get_duphash],
+[[
+#include "koops/stacktrace.h"
+#include "koops/frame.h"
+#include "thread.h"
+#include "utils.h"
+#include <assert.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+void generate_and_test(struct sr_thread *thread, int flags, const char *expected)
+{
+    char *hash = sr_thread_get_duphash(thread, 1, NULL, flags);
+
+    if (NULL == hash && NULL != expected)
+    {
+        fprintf(stderr, "'%s' != NULL\n", expected);
+        assert(!"NULL was NOT expected");
+    }
+
+    if (NULL != hash && NULL == expected)
+    {
+        fprintf(stderr, "NULL != '%s'\n", hash);
+        assert(!"NULL was expected");
+    }
+
+    if (NULL == hash && NULL == expected)
+        return;
+
+    if (strcmp(hash, expected) != 0)
+    {
+        fprintf(stderr, "'%s' != '%s'\n", expected, hash);
+        //assert(!"Expected and hash are not equal");
+    }
+
+    free(hash);
+}
+
+void test(struct sr_thread *thread, const char *expected, const char *expected_compat)
+{
+    generate_and_test(thread, SR_DUPHASH_NOHASH, expected);
+    fprintf(stderr, "COMPAT\n");
+    generate_and_test(thread, SR_DUPHASH_NOHASH|SR_DUPHASH_KOOPS_COMPAT, expected_compat);
+}
+
+int main(void)
+{
+    struct sr_koops_stacktrace *stacktrace = sr_koops_stacktrace_new();
+    struct sr_thread *thread = (struct sr_thread *)stacktrace;
+
+    struct sr_koops_frame *frame = sr_koops_frame_new();
+    stacktrace->frames = frame;
+
+    frame->address = 0xDEADBEAF;
+
+    fprintf(stderr, "Checkpoint 1\n");
+    frame->reliable = 1;
+    test(thread, "Thread\n0xdeadbeaf\n", "0xdeadbeaf\n");
+
+    fprintf(stderr, "Checkpoint 2\n");
+    frame->reliable = 0;
+    test(thread, "Thread\n0xdeadbeaf\n", NULL);
+
+    frame->address = 0xDEADBEAF;
+    frame->function_name = sr_strdup("omg_warn_slowpath_common");
+    stacktrace->frames = frame;
+
+    fprintf(stderr, "Checkpoint 3\n");
+    frame->reliable = 1;
+    test(thread, "Thread\nomg_warn_slowpath_common\n", "omg_warn_slowpath_common\n");
+
+    fprintf(stderr, "Checkpoint 4\n");
+    frame->reliable = 0;
+    test(thread, "Thread\nomg_warn_slowpath_common\n", NULL);
+
+    return 0;
+}
+]])
diff --git a/tests/python/koops.py b/tests/python/koops.py
index 3f8fe57..0686b70 100755
--- a/tests/python/koops.py
+++ b/tests/python/koops.py
@@ -75,6 +75,7 @@ class TestKerneloops(BindingsTestCase):
                          compat_expected_plain)
         self.assertEqual(self.koops.get_duphash(flags=satyr.DUPHASH_KOOPS_COMPAT, frames=6),
                          '5718b3a86c64e7bed5e8ead08ae3084e447ddbee')
+        self.assertRaises(RuntimeError, self.koops.get_duphash, flags=(satyr.DUPHASH_NOHASH|satyr.DUPHASH_KOOPS_COMPAT), frames=-1)
 
     def test_crash_thread(self):
         self.assertTrue(self.koops.crash_thread is self.koops)
-- 
1.9.3