From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Fri, 21 Oct 2016 00:00:00 +0000
X-Dgit-Generated: 1.20110708.1-4.1 7fc1ec5f57e2299be6b1248db82da42f569c6ab0
Subject: fix wrong pointer alias


---

--- grok-1.20110708.1.orig/grok_pattern.c
+++ grok-1.20110708.1/grok_pattern.c
@@ -33,9 +33,9 @@ int grok_pattern_add(const grok_t *grok,
 }
 
 int grok_pattern_find(const grok_t *grok, const char *name, size_t name_len,
-                      const char **regexp, size_t *regexp_len) {
+                      const char **regexp, int *regexp_len) {
   TCTREE *patterns = grok->patterns;
-  *regexp = tctreeget(patterns, name, name_len, (int*) regexp_len);
+  *regexp = tctreeget(patterns, name, name_len, regexp_len);
 
   grok_log(grok, LOG_PATTERNS, "Searching for pattern '%s' (%s): %.*s",
            name, *regexp == NULL ? "not found" : "found", *regexp_len, *regexp);
--- grok-1.20110708.1.orig/grok_pattern.h
+++ grok-1.20110708.1/grok_pattern.h
@@ -9,7 +9,7 @@ TCLIST *grok_pattern_name_list(const gro
 int grok_pattern_add(const grok_t *grok, const char *name, size_t name_len,
                       const char *regexp, size_t regexp_len);
 int grok_pattern_find(const grok_t *grok, const char *name, size_t name_len,
-                      const char **regexp, size_t *regexp_len);
+                      const char **regexp, int *regexp_len);
 int grok_patterns_import_from_file(const grok_t *grok, const char *filename);
 int grok_patterns_import_from_string(const grok_t *grok, const char *buffer);
 
--- grok-1.20110708.1.orig/grokre.c
+++ grok-1.20110708.1/grokre.c
@@ -183,7 +183,7 @@ static char *grok_pattern_expand(grok_t
     int start, end, matchlen;
     const char *pattern_regex;
     int patname_len;
-    size_t regexp_len;
+    int regexp_len;
     int pattern_regex_needs_free = 0;
 
     grok_log(grok, LOG_REGEXPAND, "% 20s: %.*s", "start of loop",
--- grok-1.20110708.1.orig/test/grok_pattern.test.c
+++ grok-1.20110708.1/test/grok_pattern.test.c
@@ -4,7 +4,7 @@
 void test_grok_pattern_add_and_find_work(void) {
   INIT;
   const char *regexp = NULL;
-  size_t len = 0;
+  int len = 0;
 
   grok_pattern_add(&grok, "WORD", 5, "\\w+", 3);
   grok_pattern_add(&grok, "TEST", 5, "TEST", 4);
