diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:49:11 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:49:11 +0200 |
| commit | 3053928d3e9e12e59c46917113bad496487f1d28 (patch) | |
| tree | 591c17cafc365399cc88774bba985af7276d957e /tools/plink/conf.c | |
| parent | 7c21629fbeb51b65fd0625bb36d888587d62fd89 (diff) | |
| parent | a3fe3e22d85e8aa795df85c21814fc84cac42e99 (diff) | |
| download | vcxsrv-3053928d3e9e12e59c46917113bad496487f1d28.tar.gz vcxsrv-3053928d3e9e12e59c46917113bad496487f1d28.tar.bz2 vcxsrv-3053928d3e9e12e59c46917113bad496487f1d28.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
tools/plink/misc.h
tools/plink/ssh.c
tools/plink/sshbn.c
tools/plink/winplink.c
Diffstat (limited to 'tools/plink/conf.c')
| -rw-r--r-- | tools/plink/conf.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/plink/conf.c b/tools/plink/conf.c index 7b6a0137a..e80f5853a 100644 --- a/tools/plink/conf.c +++ b/tools/plink/conf.c @@ -522,14 +522,15 @@ int conf_deserialise(Conf *conf, void *vdata, int maxsize) unsigned char *data = (unsigned char *)vdata; unsigned char *start = data; struct conf_entry *entry; - int primary, used; + unsigned primary; + int used; unsigned char *zero; while (maxsize >= 4) { primary = GET_32BIT_MSB_FIRST(data); data += 4, maxsize -= 4; - if ((unsigned)primary >= N_CONFIG_OPTIONS) + if (primary >= N_CONFIG_OPTIONS) break; entry = snew(struct conf_entry); @@ -541,7 +542,7 @@ int conf_deserialise(Conf *conf, void *vdata, int maxsize) sfree(entry); goto done; } - entry->key.secondary.i = GET_32BIT_MSB_FIRST(data); + entry->key.secondary.i = toint(GET_32BIT_MSB_FIRST(data)); data += 4, maxsize -= 4; break; case TYPE_STR: @@ -564,7 +565,7 @@ int conf_deserialise(Conf *conf, void *vdata, int maxsize) sfree(entry); goto done; } - entry->value.u.intval = GET_32BIT_MSB_FIRST(data); + entry->value.u.intval = toint(GET_32BIT_MSB_FIRST(data)); data += 4, maxsize -= 4; break; case TYPE_STR: |