summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/sort.c7
-rw-r--r--test-suite/tests/sort.test9
2 files changed, 13 insertions, 3 deletions
diff --git a/libguile/sort.c b/libguile/sort.c
index 5fdbb177c..ecadd82ea 100644
--- a/libguile/sort.c
+++ b/libguile/sort.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001,2002, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
* as published by the Free Software Foundation; either version 3 of
@@ -495,6 +495,11 @@ SCM_DEFINE (scm_stable_sort_x, "stable-sort!", 2, 0, 0,
vec_elts = scm_vector_writable_elements (items, &vec_handle,
&len, &inc);
+ if (len == 0) {
+ scm_array_handle_release (&vec_handle);
+ return items;
+ }
+
temp = scm_c_make_vector (len, SCM_UNDEFINED);
temp_elts = scm_vector_writable_elements (temp, &temp_handle,
NULL, NULL);
diff --git a/test-suite/tests/sort.test b/test-suite/tests/sort.test
index 4223b923f..9209b539f 100644
--- a/test-suite/tests/sort.test
+++ b/test-suite/tests/sort.test
@@ -1,5 +1,5 @@
;;;; sort.test --- tests Guile's sort functions -*- scheme -*-
-;;;; Copyright (C) 2003, 2006, 2007, 2009 Free Software Foundation, Inc.
+;;;; Copyright (C) 2003, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
;;;;
;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public
@@ -73,5 +73,10 @@
;; in guile 1.8.0 and 1.8.1 this test failed, an empty list provoked a
;; wrong-type-arg exception (where it shouldn't)
(pass-if "empty list"
- (eq? '() (stable-sort '() <))))
+ (eq? '() (stable-sort '() <)))
+
+ ;; Ditto here, but up to 2.0.1 and 2.1.0 and invoking undefined
+ ;; behavior (integer underflow) leading to crashes.
+ (pass-if "empty vector"
+ (equal? '#() (stable-sort '#() <))))