projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `default_port' rather than `22' when loading a default session.
[u/mdw/putty]
/
winstore.c
diff --git
a/winstore.c
b/winstore.c
index
3aef22f
..
fd53ecf
100644
(file)
--- a/
winstore.c
+++ b/
winstore.c
@@
-5,6
+5,7
@@
#include <windows.h>
#include <stdio.h>
#include <windows.h>
#include <stdio.h>
+#include <stdlib.h>
#include "putty.h"
#include "storage.h"
#include "putty.h"
#include "storage.h"
@@
-57,16
+58,16
@@
void *open_settings_w(char *sessionname) {
int ret;
char *p;
int ret;
char *p;
- p = malloc(3*strlen(sessionname)+1);
+ p =
s
malloc(3*strlen(sessionname)+1);
mungestr(sessionname, p);
ret = RegCreateKey(HKEY_CURRENT_USER, puttystr, &subkey1);
if (ret != ERROR_SUCCESS) {
mungestr(sessionname, p);
ret = RegCreateKey(HKEY_CURRENT_USER, puttystr, &subkey1);
if (ret != ERROR_SUCCESS) {
- free(p);
+
s
free(p);
return NULL;
}
ret = RegCreateKey(subkey1, p, &sesskey);
return NULL;
}
ret = RegCreateKey(subkey1, p, &sesskey);
- free(p);
+
s
free(p);
RegCloseKey(subkey1);
if (ret != ERROR_SUCCESS)
return NULL;
RegCloseKey(subkey1);
if (ret != ERROR_SUCCESS)
return NULL;
@@
-92,7
+93,7
@@
void *open_settings_r(char *sessionname) {
HKEY subkey1, sesskey;
char *p;
HKEY subkey1, sesskey;
char *p;
- p = malloc(3*strlen(sessionname)+1);
+ p =
s
malloc(3*strlen(sessionname)+1);
mungestr(sessionname, p);
if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) {
mungestr(sessionname, p);
if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) {
@@
-104,7
+105,7
@@
void *open_settings_r(char *sessionname) {
RegCloseKey(subkey1);
}
RegCloseKey(subkey1);
}
- free(p);
+
s
free(p);
return (void *)sesskey;
}
return (void *)sesskey;
}
@@
-146,10
+147,10
@@
void del_settings (char *sessionname) {
if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS)
return;
if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS)
return;
- p = malloc(3*strlen(sessionname)+1);
+ p =
s
malloc(3*strlen(sessionname)+1);
mungestr(sessionname, p);
RegDeleteKey(subkey1, p);
mungestr(sessionname, p);
RegDeleteKey(subkey1, p);
- free(p);
+
s
free(p);
RegCloseKey(subkey1);
}
RegCloseKey(subkey1);
}
@@
-166,7
+167,7
@@
void *enum_settings_start(void) {
if (RegCreateKey(HKEY_CURRENT_USER, puttystr, &key) != ERROR_SUCCESS)
return NULL;
if (RegCreateKey(HKEY_CURRENT_USER, puttystr, &key) != ERROR_SUCCESS)
return NULL;
- ret = malloc(sizeof(*ret));
+ ret =
s
malloc(sizeof(*ret));
if (ret) {
ret->key = key;
ret->i = 0;
if (ret) {
ret->key = key;
ret->i = 0;
@@
-178,11
+179,11
@@
void *enum_settings_start(void) {
char *enum_settings_next(void *handle, char *buffer, int buflen) {
struct enumsettings *e = (struct enumsettings *)handle;
char *otherbuf;
char *enum_settings_next(void *handle, char *buffer, int buflen) {
struct enumsettings *e = (struct enumsettings *)handle;
char *otherbuf;
- otherbuf = malloc(3*buflen);
+ otherbuf =
s
malloc(3*buflen);
if (otherbuf && RegEnumKey(e->key, e->i++, otherbuf,
3*buflen) == ERROR_SUCCESS) {
unmungestr(otherbuf, buffer, buflen);
if (otherbuf && RegEnumKey(e->key, e->i++, otherbuf,
3*buflen) == ERROR_SUCCESS) {
unmungestr(otherbuf, buffer, buflen);
- free(otherbuf);
+
s
free(otherbuf);
return buffer;
} else
return NULL;
return buffer;
} else
return NULL;
@@
-192,7
+193,7
@@
char *enum_settings_next(void *handle, char *buffer, int buflen) {
void enum_settings_finish(void *handle) {
struct enumsettings *e = (struct enumsettings *)handle;
RegCloseKey(e->key);
void enum_settings_finish(void *handle) {
struct enumsettings *e = (struct enumsettings *)handle;
RegCloseKey(e->key);
- free(e);
+
s
free(e);
}
static void hostkey_regname(char *buffer, char *hostname,
}
static void hostkey_regname(char *buffer, char *hostname,
@@
-221,8
+222,6
@@
int verify_host_key(char *hostname, int port, char *keytype, char *key) {
*/
otherstr = smalloc(len);
regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
*/
otherstr = smalloc(len);
regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
- if (!otherstr || !regname)
- fatalbox("Out of memory");
hostkey_regname(regname, hostname, port, keytype);
hostkey_regname(regname, hostname, port, keytype);
@@
-315,8
+314,6
@@
void store_host_key(char *hostname, int port, char *keytype, char *key) {
HKEY rkey;
regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
HKEY rkey;
regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
- if (!regname)
- fatalbox("Out of memory");
hostkey_regname(regname, hostname, port, keytype);
hostkey_regname(regname, hostname, port, keytype);