aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-06-06 00:02:33 +0200
committerLudovic Courtès <ludo@gnu.org>2014-06-06 00:05:18 +0200
commitfb9347707fa2ca1cd968d56bc7ae29596c6aff81 (patch)
treeffd5897a1d15ef4350f1d9b5936d36d84e72d77e /gdb
parent6ef284bd18c31645eb3ec4e7691a0f07100d6b4e (diff)
downloadgdb-fb9347707fa2ca1cd968d56bc7ae29596c6aff81.zip
gdb-fb9347707fa2ca1cd968d56bc7ae29596c6aff81.tar.gz
gdb-fb9347707fa2ca1cd968d56bc7ae29596c6aff81.tar.bz2
guile: Type-check the argument to 'history-append!'.
gdb/ 2014-06-05 Ludovic Courtès <ludo@gnu.org> * guile/scm-value.c (gdbscm_history_append_x): Use 'vlscm_get_value_smob_arg_unsafe' instead of 'vlscm_scm_to_value'. gdb/testsuite/ 2014-06-05 Ludovic Courtès <ludo@gnu.org> * gdb.guile/scm-value.exp (test_value_in_inferior): Add test "history-append! type error".
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/guile/scm-value.c4
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.guile/scm-value.exp4
4 files changed, 18 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e671ff5..17f251b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-05 Ludovic Courtès <ludo@gnu.org>
+
+ * guile/scm-value.c (gdbscm_history_append_x): Use
+ 'vlscm_get_value_smob_arg_unsafe' instead of
+ 'vlscm_scm_to_value'.
+
2014-06-05 Simon Marchi <simon.marchi@ericsson.com>
PR mi/15806
diff --git a/gdb/guile/scm-value.c b/gdb/guile/scm-value.c
index 8e579a4..0ae8103 100644
--- a/gdb/guile/scm-value.c
+++ b/gdb/guile/scm-value.c
@@ -1295,9 +1295,11 @@ gdbscm_history_append_x (SCM value)
{
int res_index = -1;
struct value *v;
+ value_smob *v_smob;
volatile struct gdb_exception except;
- v = vlscm_scm_to_value (value);
+ v_smob = vlscm_get_value_smob_arg_unsafe (value, SCM_ARG1, FUNC_NAME);
+ v = v_smob->value;
TRY_CATCH (except, RETURN_MASK_ALL)
{
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 3526388..83c57e0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-06-05 Ludovic Courtès <ludo@gnu.org>
+
+ * gdb.guile/scm-value.exp (test_value_in_inferior): Add test
+ "history-append! type error".
+
2014-06-05 Simon Marchi <simon.marchi@ericsson.com>
* gdb.mi/mi-breakpoint-changed.exp (test_insert_delete_modify): Fix
diff --git a/gdb/testsuite/gdb.guile/scm-value.exp b/gdb/testsuite/gdb.guile/scm-value.exp
index 2784da2..425873e 100644
--- a/gdb/testsuite/gdb.guile/scm-value.exp
+++ b/gdb/testsuite/gdb.guile/scm-value.exp
@@ -71,6 +71,10 @@ proc test_value_in_inferior {} {
gdb_test_no_output "guile (gc)"
gdb_test "p \$\$" "= 42"
+ # Make sure 'history-append!' rejects non-value objects.
+ gdb_test "gu (history-append! 123)" \
+ "ERROR:.* Wrong type argument.*" "history-append! type error"
+
# Test dereferencing the argv pointer.
# Just get inferior variable argv the value history, available to guile.