Fix error reporting pointer parameters in winsecur.c.

[PuTTY.git] / unix / gtkmain.c

diff --git a/unix/gtkmain.c b/unix/gtkmain.c
index 00db3464b6e48cb7703a9582710648d2d6a89811..c681b93d825d174e726a6ead9e679e0001f0ca0b 100644 (file)
--- a/unix/gtkmain.c
+++ b/unix/gtkmain.c
@@ -287,10 +287,13 @@ static void help(FILE *fp) {
 }
 
 static void version(FILE *fp) {
-    if(fprintf(fp, "%s: %s\n", appname, ver) < 0 || fflush(fp) < 0) {
+    char *buildinfo_text = buildinfo("\n");
+    if(fprintf(fp, "%s: %s\n%s\n", appname, ver, buildinfo_text) < 0 ||
+       fflush(fp) < 0) {
        perror("output error");
        exit(1);
     }
+    sfree(buildinfo_text);
 }
 
 static struct gui_data *the_inst;
@@ -582,11 +585,13 @@ int main(int argc, char **argv)
     block_signal(SIGPIPE, 1);
 
     if (argc > 1 && !strncmp(argv[1], "---", 3)) {
+        extern const int dup_check_launchable;
+
        read_dupsession_data(conf, argv[1]);
        /* Splatter this argument so it doesn't clutter a ps listing */
        smemclr(argv[1], strlen(argv[1]));
 
-        assert(conf_launchable(conf));
+        assert(!dup_check_launchable || conf_launchable(conf));
         need_config_box = FALSE;
     } else {
        /* By default, we bring up the config dialog, rather than launching