From: Yurii Chalov -X (ychalov - SOFTSERVE INC at Cisco) <ychalov@cisco.com>
Date: Thu, 9 Oct 2025 19:32:00 +0000 (+0000)
Subject: Pull request #4930: js_norm: prevent memory leak when temp buffer was processing
X-Git-Tag: 3.9.7.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ee208d41ae959b128aa5537ce38a79c6c0e313b;p=thirdparty%2Fsnort3.git

Pull request #4930: js_norm: prevent memory leak when temp buffer was processing

Merge in SNORT/snort3 from ~YCHALOV/snort3:js_norm_mem_leak to master

Squashed commit of the following:

commit c5b89ffcfbc304527f38d1e5ef2eb5d02e3bbcd5
Author: Yurii Chalov <ychalov@cisco.com>
Date:   Fri Oct 3 14:39:02 2025 +0200

    js_norm: prevent memory leak when temp buffer was processing
---

diff --git a/src/js_norm/js_tokenizer.l b/src/js_norm/js_tokenizer.l
index b3bee1672..5af78cde7 100644
--- a/src/js_norm/js_tokenizer.l
+++ b/src/js_norm/js_tokenizer.l
@@ -1401,6 +1401,9 @@ JSTokenizer::JSTokenizer(std::istream& in, std::ostream& out,
 
 JSTokenizer::~JSTokenizer()
 {
+    if (tmp_buffer)
+        yy_switch_to_buffer((YY_BUFFER_STATE)cur_buffer);
+
     yy_delete_buffer((YY_BUFFER_STATE)tmp_buffer);
     delete[] tmp_buf;
     tmp_buf = nullptr;