From 5cf3c648fbb8dd0baeb40660b555c967778d845f Mon Sep 17 00:00:00 2001 From: Jehan Date: Mon, 22 Mar 2021 18:29:34 +0100 Subject: [PATCH] src: reset shortcut charset/language on Reset(). Failing to do so, we always return the same language once we detected a shortcut one, even after resetting. For instance, the issue happened on the uchardet CLI tool. --- src/nsUniversalDetector.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/nsUniversalDetector.cpp b/src/nsUniversalDetector.cpp index ea9a4d6..06c2d9a 100644 --- a/src/nsUniversalDetector.cpp +++ b/src/nsUniversalDetector.cpp @@ -59,6 +59,10 @@ nsUniversalDetector::nsUniversalDetector(PRUint32 aLanguageFilter) mLastChar = '\0'; mLanguageFilter = aLanguageFilter; + shortcutCharset = nullptr; + shortcutLanguage = nullptr; + shortcutConfidence = 0.01; + PRUint32 i; for (i = 0; i < NUM_OF_CHARSET_PROBERS; i++) mCharSetProbers[i] = nsnull; @@ -85,6 +89,10 @@ nsUniversalDetector::Reset() mInputState = ePureAscii; mLastChar = '\0'; + shortcutCharset = nullptr; + shortcutLanguage = nullptr; + shortcutConfidence = 0.01; + if (mEscCharSetProber) mEscCharSetProber->Reset();