fix: memory leak in influx parser (influxdata#9787)

normandoleonardo · Oct 7, 2021 · 128ed88 · 128ed88
1 parent 15753a6
commit 128ed88
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/plugins/parsers/influx/machine.go b/plugins/parsers/influx/machine.go
@@ -3747,13 +3747,6 @@ func (m *streamMachine) Next() error {
 	m.machine.finishMetric = false
 
 	for {
-		// Expand the buffer if it is full
-		if m.machine.pe == len(m.machine.data) {
-			expanded := make([]byte, 2*len(m.machine.data))
-			copy(expanded, m.machine.data)
-			m.machine.data = expanded
-		}
-
 		err := m.machine.exec()
 		if err != nil {
 			return err
@@ -3764,6 +3757,13 @@ func (m *streamMachine) Next() error {
 			break
 		}
 
+		// Expand the buffer if it is full
+		if m.machine.pe == len(m.machine.data) {
+			expanded := make([]byte, 2*len(m.machine.data))
+			copy(expanded, m.machine.data)
+			m.machine.data = expanded
+		}
+
 		n, err := m.reader.Read(m.machine.data[m.machine.pe:])
 		if n == 0 && err == io.EOF {
 			m.machine.eof = m.machine.pe

diff --git a/plugins/parsers/influx/machine.go.rl b/plugins/parsers/influx/machine.go.rl
@@ -499,13 +499,6 @@ func (m *streamMachine) Next() error {
 	m.machine.finishMetric = false
 
 	for {
-		// Expand the buffer if it is full
-		if m.machine.pe == len(m.machine.data) {
-			expanded := make([]byte, 2 * len(m.machine.data))
-			copy(expanded, m.machine.data)
-			m.machine.data = expanded
-		}
-
 		err := m.machine.exec()
 		if err != nil {
 			return err
@@ -516,6 +509,13 @@ func (m *streamMachine) Next() error {
 			break
 		}
 
+		// Expand the buffer if it is full
+		if m.machine.pe == len(m.machine.data) {
+			expanded := make([]byte, 2 * len(m.machine.data))
+			copy(expanded, m.machine.data)
+			m.machine.data = expanded
+		}
+
 		n, err := m.reader.Read(m.machine.data[m.machine.pe:])
 		if n == 0 && err == io.EOF {
 			m.machine.eof = m.machine.pe