From 544f93c4df12c31b343f7e60bdbba40a8041b361 Mon Sep 17 00:00:00 2001 From: Philippe Brochard Date: Fri, 6 Dec 2013 21:03:55 +0100 Subject: [PATCH] Add some necessary ensure-printable protection --- src/clfswm-internal.lisp | 12 +++++++----- src/clfswm-query.lisp | 13 +++++++------ 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp index 19af51c..b322c38 100644 --- a/src/clfswm-internal.lisp +++ b/src/clfswm-internal.lisp @@ -239,7 +239,7 @@ (defgeneric child-name (child)) (defmethod child-name ((child xlib:window)) - (xlib:wm-name child)) + (ensure-printable (xlib:wm-name child))) (defmethod child-name ((child frame)) (frame-name child)) @@ -268,12 +268,14 @@ (defgeneric child-fullname (child)) (defmethod child-fullname ((child xlib:window)) - (format nil "~A (~A)" (or (xlib:wm-name child) "?") (or (xlib:get-wm-class child) "?"))) + (ensure-printable + (format nil "~A (~A)" (or (xlib:wm-name child) "?") (or (xlib:get-wm-class child) "?")))) (defmethod child-fullname ((child frame)) - (aif (frame-name child) - (format nil "~A (Frame ~A)" it (frame-number child)) - (format nil "Frame ~A" (frame-number child)))) + (ensure-printable + (aif (frame-name child) + (format nil "~A (Frame ~A)" it (frame-number child)) + (format nil "Frame ~A" (frame-number child))))) (defmethod child-fullname (child) (declare (ignore child)) diff --git a/src/clfswm-query.lisp b/src/clfswm-query.lisp index 0181374..d7a14cd 100644 --- a/src/clfswm-query.lisp +++ b/src/clfswm-query.lisp @@ -41,12 +41,13 @@ (defun add-char-in-query-string (char) - (setf *query-string* (concatenate 'string - (when (<= *query-pos* (length *query-string*)) - (subseq *query-string* 0 *query-pos*)) - (string char) - (when (< *query-pos* (length *query-string*)) - (subseq *query-string* *query-pos*)))) + (setf *query-string* (ensure-printable + (concatenate 'string + (when (<= *query-pos* (length *query-string*)) + (subseq *query-string* 0 *query-pos*)) + (string char) + (when (< *query-pos* (length *query-string*)) + (subseq *query-string* *query-pos*))))) (incf *query-pos*)) -- 2.11.4.GIT