zscanner: reset parser state upon input initialization

diff --git a/src/libknot/yparser/ypbody.c b/src/libknot/yparser/ypbody.c
index 9a981159b72116d0238cb0d9353341ec311e7639..467b613d8091c12cfb547dc9d3a21e6be660b109 100644 (file)
--- a/src/libknot/yparser/ypbody.c
+++ b/src/libknot/yparser/ypbody.c
@@ -1,5 +1,5 @@
 
-/*  Copyright (C) 2015 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
+/*  Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

diff --git a/src/libzscanner/scanner.c.g2 b/src/libzscanner/scanner.c.g2
index 910efffc98dae9de9dbb5f3e27679ec1a2ca7c67..ad1d77442c0e71d204ab0a0819d85cd3694dffc3 100644 (file)
--- a/src/libzscanner/scanner.c.g2
+++ b/src/libzscanner/scanner.c.g2
@@ -260,6 +260,8 @@ int zs_set_input_string(
        const char *input,
        size_t size)
 {
+       s->state = ZS_STATE_NONE;
+
        return set_input_string(s, input, size, false);
 }
 
@@ -351,6 +353,8 @@ int zs_set_input_file(
                return -1;
        }
 
+       s->state = ZS_STATE_NONE;
+
        return 0;
 }
 

diff --git a/src/libzscanner/scanner.c.t0 b/src/libzscanner/scanner.c.t0
index ab7cb792f1c896b9ae1440d4ef4abd099a2fc309..29205f65713ce1a5a7ecbb0acafa2cecd6f90e51 100644 (file)
--- a/src/libzscanner/scanner.c.t0
+++ b/src/libzscanner/scanner.c.t0
@@ -5623,6 +5623,8 @@ int zs_set_input_string(
        const char *input,
        size_t size)
 {
+       s->state = ZS_STATE_NONE;
+
        return set_input_string(s, input, size, false);
 }
 
@@ -5714,6 +5716,8 @@ int zs_set_input_file(
                return -1;
        }
 
+       s->state = ZS_STATE_NONE;
+
        return 0;
 }
 

diff --git a/src/libzscanner/scanner.rl b/src/libzscanner/scanner.rl
index 3c6bc04f05810c27f7352ef2aa68fae077d720e4..4050b562da4419d585df04f8af4bb84736b88789 100644 (file)
--- a/src/libzscanner/scanner.rl
+++ b/src/libzscanner/scanner.rl
@@ -261,6 +261,8 @@ int zs_set_input_string(
        const char *input,
        size_t size)
 {
+       s->state = ZS_STATE_NONE;
+
        return set_input_string(s, input, size, false);
 }
 
@@ -352,6 +354,8 @@ int zs_set_input_file(
                return -1;
        }
 
+       s->state = ZS_STATE_NONE;
+
        return 0;
 }