hang when reading it because strtok() kept getting the full list passed in.
Fix this, and add an assert() for an assumption documented in a comment while
I'm in the area.
git-svn-id: svn://svn.tartarus.org/sgt/putty@6294
cda61777-01e9-0310-a592-
d414129be87e
* settings.c: read and write saved sessions. (platform-independent)
*/
* settings.c: read and write saved sessions. (platform-independent)
*/
#include <stdio.h>
#include <stdlib.h>
#include "putty.h"
#include <stdio.h>
#include <stdlib.h>
#include "putty.h"
int *array)
{
char commalist[80];
int *array)
{
char commalist[80];
+ char *tokarg = commalist;
int n;
unsigned long seen = 0; /* bitmap for weeding dups etc */
gpps(sesskey, name, def, commalist, sizeof(commalist));
int n;
unsigned long seen = 0; /* bitmap for weeding dups etc */
gpps(sesskey, name, def, commalist, sizeof(commalist));
- key = strtok(n==0 ? commalist : NULL, ","); /* sorry */
+ key = strtok(tokarg, ","); /* sorry */
+ tokarg = NULL;
if (!key) break;
if (((v = key2val(mapping, nvals, key)) != -1) &&
!(seen & 1<<v)) {
if (!key) break;
if (((v = key2val(mapping, nvals, key)) != -1) &&
!(seen & 1<<v)) {
{
int i;
for (i = 0; i < nvals; i++) {
{
int i;
for (i = 0; i < nvals; i++) {
+ assert(mapping[i].v < 32);
if (!(seen & 1<<mapping[i].v)) {
array[n] = mapping[i].v;
n++;
if (!(seen & 1<<mapping[i].v)) {
array[n] = mapping[i].v;
n++;