From ff0f1f00e6e8a9fead2d72137c8d57d49b649648 Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 6 Sep 2007 14:32:03 +0000 Subject: [PATCH] Made %TREE-PATH-TO-VECTOR handle null pointers Organization: Straylight/Edgeware From: espen --- gtk/gtktree.lisp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gtk/gtktree.lisp b/gtk/gtktree.lisp index 89e103b..bf47a0f 100644 --- a/gtk/gtktree.lisp +++ b/gtk/gtktree.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: gtktree.lisp,v 1.29 2007-08-20 11:20:21 espen Exp $ +;; $Id: gtktree.lisp,v 1.30 2007-09-06 14:32:03 espen Exp $ (in-package "GTK") @@ -255,11 +255,12 @@ (defun %make-tree-path (path) location)) (defun %tree-path-to-vector (location) - (let ((indices (%tree-path-get-indices location)) - (depth (%tree-path-get-depth location))) - (if (null-pointer-p indices) - #() - (map-c-vector 'vector #'identity indices 'int depth)))) + (unless (null-pointer-p location) + (let ((indices (%tree-path-get-indices location)) + (depth (%tree-path-get-depth location))) + (if (null-pointer-p indices) + #() + (map-c-vector 'vector #'identity indices 'int depth))))) (defmacro %with-tree-path ((var path) &body body) (let* ((pointer-offset (adjust-offset (size-of 'int) 'pointer)) -- [mdw]