diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 21f28e7..f37ce1c 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -305,7 +305,7 @@ part." (defun org-protocol-unhex-string(str) "Unhex hexified unicode strings as returned from the JavaScript function -encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'." +encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ö'." (setq str (or str "")) (let ((tmp "") (case-fold-search t)) @@ -321,7 +321,11 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'." (defun org-protocol-unhex-compound (hex) - "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ü'." + "Unhexify unicode hex-chars. E.g. `%C3%B6' is the German Umlaut `ö'. +Note: this function also decodes single byte encodings like +`%E1' (\"á\") if not followed by another `%[A-F0-9]{2}' group. +Singlebyte decoding is not secure though, since we could have +two single byte characters above 128 in a row." (let* ((bytes (remove "" (split-string hex "%"))) (ret "") (eat 0) @@ -353,9 +357,22 @@ encodeURIComponent. E.g. `%C3%B6' is the german Umlaut `ü'." (setq val (logxor val xor)) (setq sum (+ (lsh sum shift) val)) (if (> eat 0) (setq eat (- eat 1))) - (when (= 0 eat) + (cond + ((= 0 eat) ;multi byte (setq ret (concat ret (org-protocol-char-to-string sum))) (setq sum 0)) + ((not bytes) ; single byte(s) + (let ((bytes (remove "" (split-string hex "%"))) + (ret "")) + (message "bytes: %s" bytes) + + (while bytes + (let* ((b (pop bytes)) + (a (elt b 0)) + (b (elt b 1))) + (setq ret + (concat ret (char-to-string + (+ (lsh a 4) b))))))))) )) ;; end (while bytes ret ))