Don't encode strings to utf-8 before passing them to the dynamic libr…

…ary. It converts them from multibyte to unibyte which bypasses utf-8 validation.
kurnevsky · Dec 31, 2024 · 4899052 · 4899052
1 parent 0c4348f
commit 4899052
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/modules/emacs/fuzzy-matcher.nix b/modules/emacs/fuzzy-matcher.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
   cargoLock = {
     lockFile = ./fuzzy-matcher/Cargo.lock;
     outputHashes = {
-      "emacs-0.19.0" = "sha256-094GLODTvUpwjs77KTsAYBdytX726c2aNkyOS9sxRuU=";
+      "emacs-0.19.0" = "sha256-qMRNuGc+HgGwbwucxGC9KENHUh4yl8D8r+TINM6nTjY=";
     };
   };
 }
diff --git a/modules/emacs/fuzzy-matcher/Cargo.lock b/modules/emacs/fuzzy-matcher/Cargo.lock
diff --git a/modules/emacs/fuzzy-matcher/Cargo.toml b/modules/emacs/fuzzy-matcher/Cargo.toml
@@ -11,7 +11,7 @@ name = "fuzzy_matcher_el"
 crate-type = ["cdylib"]
 
 [dependencies]
-emacs = { git = "https://github.com/kurnevsky/emacs-module-rs.git", rev = "297bdd761b3c827d9387708330f3cef62edd7be8" }
+emacs = { git = "https://github.com/kurnevsky/emacs-module-rs.git", rev = "49665c9ae23b19711fc41e15ac526755f6a48072", features = [ "utf-8-validation" ] }
 nucleo-matcher = "0.3"
 lazy_static = "1.5"
 

diff --git a/modules/emacs/init.el b/modules/emacs/init.el
@@ -570,9 +570,7 @@ which LANG was detected but these are ignored."
       (substring string 0 (- (length string) 1))
       string))
   (defun fuzzy-matcher-propertize (pattern candidate)
-    (let* ((score (fuzzy-matcher-fuzzy-indices
-                    (encode-coding-string pattern 'utf-8 t)
-                    (encode-coding-string (fuzzy-matcher-without-tofu-char candidate) 'utf-8 t)))
+    (let* ((score (fuzzy-matcher-fuzzy-indices pattern (fuzzy-matcher-without-tofu-char candidate)))
             (candidate (copy-sequence candidate)))
       (unless (string-empty-p pattern)
         (put-text-property 0 1 'completion-score (- (* (or (car score) 0) 100) (length candidate)) candidate))