diff options
| author | mwesdorp <mwesdorp> | 2014-04-14 08:48:54 +0000 |
|---|---|---|
| committer | mwesdorp <mwesdorp> | 2014-04-14 08:48:54 +0000 |
| commit | 7a35edcd075f15176b86b703a1efa6762ee872be (patch) | |
| tree | df4df1407e077c0a0e888fb514c4bf48726dfb92 /src | |
| parent | dcf0b029a73e273255964269c36a4d555c2800c3 (diff) | |
sqsh-2.5.16.1 bugfixes and improvements
Diffstat (limited to 'src')
| -rw-r--r-- | src/cmd_do.c | 5 | ||||
| -rw-r--r-- | src/sqsh_config.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/cmd_do.c b/src/cmd_do.c index fa64a88..e44dc18 100644 --- a/src/cmd_do.c +++ b/src/cmd_do.c @@ -75,7 +75,7 @@ int cmd_do( argc, argv ) varbuf_t *orig_sqlbuf; /* SQL Buffer upon entry */ CS_CONNECTION *orig_conn; /* Connection upon entry */ CS_CONTEXT *orig_ctxt; /* Context upon entry */ - char orig_password[SQSH_PASSLEN+1]; /* Current session password */ + char orig_password[SQSH_PASSLEN+1] = ""; /* Current session password */ int ret = False; int have_error = False; int exit_status; @@ -99,7 +99,8 @@ int cmd_do( argc, argv ) env_get( g_env, "DSQUERY", &expand); env_put( g_env, "DSQUERY", expand, ENV_F_TRAN ); env_get( g_env, "database", &expand); env_put( g_env, "database", expand, ENV_F_TRAN ); env_get( g_env, "username", &expand); env_put( g_env, "username", expand, ENV_F_TRAN ); - strcpy ( orig_password, g_password); + if (g_password != NULL) + strcpy ( orig_password, g_password); while ((ch = sqsh_getopt( argc, argv, "S:U:P:D:n" )) != EOF) { diff --git a/src/sqsh_config.h b/src/sqsh_config.h index 03b449e..f7e2bf0 100644 --- a/src/sqsh_config.h +++ b/src/sqsh_config.h @@ -149,7 +149,7 @@ /* * Current version number. */ -#define SQSH_VERSION "sqsh-2.5.16" +#define SQSH_VERSION "sqsh-2.5.16.1" #if !defined(__ansi__) # if defined(__STDC__) || defined(STDC_HEADERS) || defined(PROTOTYPES) |