maksbotan    14/04/16 16:14:42

  Added:                rsyslog-7.x-mmjsonparse.patch
  Log:
  Add upstream patch for >=dev-libs/json-c-0.12, bug #507730. Thanks to Thomas 
D. <[email protected]>.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
F8DBDADE)

Revision  Changes    Path
1.1                  
app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/rsyslog/files/7-stable/rsyslog-7.x-mmjsonparse.patch?rev=1.1&content-type=text/plain

Index: rsyslog-7.x-mmjsonparse.patch
===================================================================
>From d6f5d5aae579455badb2d546f8ef292956720824 Mon Sep 17 00:00:00 2001
From: Thomas D <[email protected]>
Date: Tue, 15 Apr 2014 17:56:05 +0200
Subject: [PATCH] Fix for https://github.com/rsyslog/rsyslog/issues/61

Based on Maxim Koltsov proposed patch from 
https://bugs.gentoo.org/show_bug.cgi?id=507730
---
 plugins/mmjsonparse/mmjsonparse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/mmjsonparse/mmjsonparse.c 
b/plugins/mmjsonparse/mmjsonparse.c
index b16aef0..a5bfaa2 100644
--- a/plugins/mmjsonparse/mmjsonparse.c
+++ b/plugins/mmjsonparse/mmjsonparse.c
@@ -146,7 +146,7 @@ processJSON(instanceData *pData, msg_t *pMsg, char *buf, 
size_t lenBuf)
 
                        err = pData->tokener->err;
                        if(err != json_tokener_continue)
-                               errMsg = json_tokener_errors[err];
+                               errMsg = json_tokener_error_desc(err);
                        else
                                errMsg = "Unterminated input";
                } else if((size_t)pData->tokener->char_offset < lenBuf)
-- 
1.9.1





Reply via email to