From 9c994bc8bbfeed6a44828529fae7f549333b4f84 Mon Sep 17 00:00:00 2001 From: wyld-sw Date: Fri, 12 Feb 2016 12:04:35 -0500 Subject: [PATCH] Constrained medit/oedit/qedit/redit/sedit/trigedit to the IDXTYPE range. --- src/dg_olc.c | 5 +++++ src/medit.c | 5 +++++ src/oedit.c | 5 +++++ src/qedit.c | 8 ++++++-- src/redit.c | 5 +++++ src/sedit.c | 5 +++++ 6 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/dg_olc.c b/src/dg_olc.c index 05ef8f3..92f7268 100644 --- a/src/dg_olc.c +++ b/src/dg_olc.c @@ -49,6 +49,11 @@ ACMD(do_oasis_trigedit) number = atoi(argument); + if (number < IDXTYPE_MIN || number > IDXTYPE_MAX) { + send_to_char(ch, "That trigger VNUM can't exist.\r\n"); + return; + } + /* Check that it isn't already being edited. */ for (d = descriptor_list; d; d = d->next) { if (STATE(d) == CON_TRIGEDIT) { diff --git a/src/medit.c b/src/medit.c index 91123f0..a02bd97 100644 --- a/src/medit.c +++ b/src/medit.c @@ -88,6 +88,11 @@ ACMD(do_oasis_medit) if (number == NOBODY) number = atoi(buf1); + if (number < IDXTYPE_MIN || number > IDXTYPE_MAX) { + send_to_char(ch, "That mobile VNUM can't exist.\r\n"); + return; + } + /* Check that whatever it is isn't already being edited. */ for (d = descriptor_list; d; d = d->next) { if (STATE(d) == CON_MEDIT) { diff --git a/src/oedit.c b/src/oedit.c index fe01553..1fd922f 100644 --- a/src/oedit.c +++ b/src/oedit.c @@ -97,6 +97,11 @@ ACMD(do_oasis_oedit) if (number == NOWHERE) number = atoi(buf1); + if (number < IDXTYPE_MIN || number > IDXTYPE_MAX) { + send_to_char(ch, "That object VNUM can't exist.\r\n"); + return; + } + /* Check that whatever it is isn't already being edited. */ for (d = descriptor_list; d; d = d->next) { if (STATE(d) == CON_OEDIT) { diff --git a/src/qedit.c b/src/qedit.c index 4652e79..32dff0d 100644 --- a/src/qedit.c +++ b/src/qedit.c @@ -52,9 +52,8 @@ static void qedit_save_to_disk(int num) ACMD(do_oasis_qedit) { - int save = 0; + int number = NOWHERE, save = 0; qst_rnum real_num; - qst_vnum number = NOWHERE; struct descriptor_data *d; char *buf3; char buf1[MAX_INPUT_LENGTH]; @@ -99,6 +98,11 @@ ACMD(do_oasis_qedit) if (number == NOWHERE) number = atoi(buf1); + if (number < IDXTYPE_MIN || number > IDXTYPE_MAX) { + send_to_char(ch, "That quest VNUM can't exist.\r\n"); + return; + } + /****************************************************************************/ /** Check that the quest isn't already being edited. **/ /****************************************************************************/ diff --git a/src/redit.c b/src/redit.c index ce8e25d..90df0b4 100644 --- a/src/redit.c +++ b/src/redit.c @@ -78,6 +78,11 @@ ACMD(do_oasis_redit) if (number == NOWHERE) number = atoi(buf1); + if (number < IDXTYPE_MIN || number > IDXTYPE_MAX) { + send_to_char(ch, "That room VNUM can't exist.\r\n"); + return; + } + /* Check to make sure the room isn't already being edited. */ for (d = descriptor_list; d; d = d->next) { if (STATE(d) == CON_REDIT) { diff --git a/src/sedit.c b/src/sedit.c index 4fff1f8..bd1755b 100644 --- a/src/sedit.c +++ b/src/sedit.c @@ -93,6 +93,11 @@ ACMD(do_oasis_sedit) if (number == NOWHERE) number = atoi(buf1); + if (number < IDXTYPE_MIN || number > IDXTYPE_MAX) { + send_to_char(ch, "That shop VNUM can't exist.\r\n"); + return; + } + /* Check that the shop isn't already being edited. */ for (d = descriptor_list; d; d = d->next) { if (STATE(d) == CON_SEDIT) {