diff options
| author | marha <marha@users.sourceforge.net> | 2014-04-14 23:43:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-04-14 23:43:21 +0200 |
| commit | a3fe3e22d85e8aa795df85c21814fc84cac42e99 (patch) | |
| tree | 0b696c0a3e836781bc527015dcd28cacc9d0ef9f /tools/plink/conf.c | |
| parent | 242d48135a12fc9167430f391ba0d27d9ad44c6b (diff) | |
| download | vcxsrv-a3fe3e22d85e8aa795df85c21814fc84cac42e99.tar.gz vcxsrv-a3fe3e22d85e8aa795df85c21814fc84cac42e99.tar.bz2 vcxsrv-a3fe3e22d85e8aa795df85c21814fc84cac42e99.zip | |
plink: updated to revision 10170 of putty
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: |