diff --git a/src/opcodes.c b/src/opcodes.c
index baf1e93ffa7c02c5000c36b7f278ffaba3da3bdd..0cdc1deae3bf8f51b0bc9735ef3974017df3f671 100644
--- a/src/opcodes.c
+++ b/src/opcodes.c
@@ -21,7 +21,7 @@
 #include "cyclic.h"
 #include "builtin_functions.h"
 
-RCSID("$Id: opcodes.c,v 1.17 1998/04/06 04:18:33 hubbe Exp $");
+RCSID("$Id: opcodes.c,v 1.18 1998/04/14 20:10:49 hubbe Exp $");
 
 void index_no_free(struct svalue *to,struct svalue *what,struct svalue *ind)
 {
@@ -504,7 +504,14 @@ static INT32 low_sscanf(INT32 num_arg)
 	char * t;
 
 	if(eye>=input_len) return matches;
-	sval.u.integer=STRTOL(input+eye,&t,10);
+	if(field_length != -1 && eye+field_length < input_len)
+	{
+	  char save=input[eye+field_length+1];
+	  sval.u.integer=STRTOL(input+eye,&t,10);
+	  input[eye+field_length+1]=save;
+	}else
+	  sval.u.integer=STRTOL(input+eye,&t,10);
+
 	if(input + eye == t) return matches;
 	eye=t-input;
 	sval.type=T_INT;
@@ -517,7 +524,13 @@ static INT32 low_sscanf(INT32 num_arg)
 	char * t;
 
 	if(eye>=input_len) return matches;
-	sval.u.integer=STRTOL(input+eye,&t,16);
+	if(field_length != -1 && eye+field_length < input_len)
+	{
+	  char save=input[eye+field_length+1];
+	  sval.u.integer=STRTOL(input+eye,&t,16);
+	  input[eye+field_length+1]=save;
+	}else
+	  sval.u.integer=STRTOL(input+eye,&t,16);
 	if(input + eye == t) return matches;
 	eye=t-input;
 	sval.type=T_INT;
@@ -530,7 +543,13 @@ static INT32 low_sscanf(INT32 num_arg)
 	char * t;
 
 	if(eye>=input_len) return matches;
-	sval.u.integer=STRTOL(input+eye,&t,8);
+	if(field_length != -1 && eye+field_length < input_len)
+	{
+	  char save=input[eye+field_length+1];
+	  sval.u.integer=STRTOL(input+eye,&t,8);
+	  input[eye+field_length+1]=save;
+	}else
+	  sval.u.integer=STRTOL(input+eye,&t,8);
 	if(input + eye == t) return matches;
 	eye=t-input;
 	sval.type=T_INT;
@@ -544,7 +563,13 @@ static INT32 low_sscanf(INT32 num_arg)
 	char * t;
 
 	if(eye>=input_len) return matches;
-	sval.u.integer=STRTOL(input+eye,&t,0);
+	if(field_length != -1 && eye+field_length < input_len)
+	{
+	  char save=input[eye+field_length+1];
+	  sval.u.integer=STRTOL(input+eye,&t,0);
+	  input[eye+field_length+1]=save;
+	}else
+	  sval.u.integer=STRTOL(input+eye,&t,0);
 	if(input + eye == t) return matches;
 	eye=t-input;
 	sval.type=T_INT;