summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in4
-rw-r--r--module/bsnmp-regex.c8
3 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 88954e8..63cf085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.4:
+ * Add regexCounter variable for 64 bit values
+ * Fix assertion when selecting text at end of line
+ * Fix problems when large buffers come in at once with multiple lines.
+
0.3:
* Use my real name 'Stefan Walter':
See: http://memberwebs.com/nielsen/
diff --git a/configure.in b/configure.in
index 9a984fe..f5f8f31 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(bsnmp-regex, 0.3.90, stef@memberwebs.com)
-AM_INIT_AUTOMAKE(bsnmp-regex, 0.3.90)
+AC_INIT(bsnmp-regex, 0.4, stef@memberwebs.com)
+AM_INIT_AUTOMAKE(bsnmp-regex, 0.4)
AC_CONFIG_SRCDIR([module/bsnmp-regex.c])
AM_CONFIG_HEADER([config.h])
diff --git a/module/bsnmp-regex.c b/module/bsnmp-regex.c
index 5a77d6e..d30679b 100644
--- a/module/bsnmp-regex.c
+++ b/module/bsnmp-regex.c
@@ -330,8 +330,8 @@ process_result (struct data_entry *data, char *line, int len,
#else /* WITH_PCRE */
if (pm[idx].rm_so != -1 && pm[idx].rm_eo != -1) {
ASSERT (pm[idx].rm_eo >= pm[idx].rm_so);
- ASSERT (pm[idx].rm_eo < len);
- ASSERT (pm[idx].rm_so < len);
+ ASSERT (pm[idx].rm_eo <= len);
+ ASSERT (pm[idx].rm_so <= len);
rlen += (pm[idx].rm_eo - pm[idx].rm_so);
rlen += 1;
}
@@ -491,7 +491,7 @@ io_data (int fd, void *user_data)
break;
}
- n = t;
+ n = t + 1;
/* Break line (also DOS line) */
*t = 0;
@@ -504,7 +504,7 @@ io_data (int fd, void *user_data)
/* Move data to front of buffer */
len -= (n - line_buffer);
- memmove (line_buffer, n, len);
+ memmove (line_buffer, n, len + 1);
}
} while (r > 0);