From bf131509ed93121a8cf1d04711eeca0f45ffd1f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Tue, 14 Apr 1998 13:10:49 -0700
Subject: [PATCH] field lengths added to %d %x and %o in sscanf()
Rev: src/opcodes.c:1.18
---
src/opcodes.c | 35 ++++++++++++++++++++++++++++++-----
1 file changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/opcodes.c b/src/opcodes.c
index baf1e93ffa..0cdc1deae3 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;
--
GitLab