From fd9a7d837f57252da6593c10954abf3a9ad3273c Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Fri, 14 Mar 1997 02:36:24 +0000 Subject: [PATCH] Use temporary variable with scanf. git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1404 ec53bebd-3082-4978-b11e-865c3cabbd6b --- admin/load.c | 5 +++-- kadmin/load.c | 5 +++-- kdc/load.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/admin/load.c b/admin/load.c index a4cfa2e30..9c433e8e3 100644 --- a/admin/load.c +++ b/admin/load.c @@ -80,8 +80,9 @@ int main(int argc, char **argv) ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.contents.data = malloc(strlen(e.key)/2+1); for(i = 0; i < strlen(e.key); i += 2){ - sscanf(e.key + i, "%2x", - (unsigned char *)ent.keyblock.contents.data + (i/2)); + unsigned tmp; + sscanf(e.key + i, "%2x", &tmp); + ((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp; } ent.keyblock.contents.length = i / 2; ent.kvno = atoi(e.kvno); diff --git a/kadmin/load.c b/kadmin/load.c index a4cfa2e30..9c433e8e3 100644 --- a/kadmin/load.c +++ b/kadmin/load.c @@ -80,8 +80,9 @@ int main(int argc, char **argv) ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.contents.data = malloc(strlen(e.key)/2+1); for(i = 0; i < strlen(e.key); i += 2){ - sscanf(e.key + i, "%2x", - (unsigned char *)ent.keyblock.contents.data + (i/2)); + unsigned tmp; + sscanf(e.key + i, "%2x", &tmp); + ((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp; } ent.keyblock.contents.length = i / 2; ent.kvno = atoi(e.kvno); diff --git a/kdc/load.c b/kdc/load.c index a4cfa2e30..9c433e8e3 100644 --- a/kdc/load.c +++ b/kdc/load.c @@ -80,8 +80,9 @@ int main(int argc, char **argv) ent.keyblock.keytype = KEYTYPE_DES; ent.keyblock.contents.data = malloc(strlen(e.key)/2+1); for(i = 0; i < strlen(e.key); i += 2){ - sscanf(e.key + i, "%2x", - (unsigned char *)ent.keyblock.contents.data + (i/2)); + unsigned tmp; + sscanf(e.key + i, "%2x", &tmp); + ((unsigned char *)ent.keyblock.contents.data)[i/2] = tmp; } ent.keyblock.contents.length = i / 2; ent.kvno = atoi(e.kvno);