Commit d6b9d8dc authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

refs #5686 fix a crash during assert

git-svn-id: file:///svn/toku/tokudb@49989 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7dc6680b
...@@ -1948,10 +1948,10 @@ env_get_engine_status_text(DB_ENV * env, char * buff, int bufsiz) { ...@@ -1948,10 +1948,10 @@ env_get_engine_status_text(DB_ENV * env, char * buff, int bufsiz) {
if (r) { if (r) {
n += snprintf(buff + n, bufsiz - n, "Engine status not available: "); n += snprintf(buff + n, bufsiz - n, "Engine status not available: ");
if (!env) { if (!env) {
n += snprintf(buff + n, bufsiz - n, "no environment\n"); n += snprintf(buff + n, bufsiz - n, "no environment\n");
} }
else if (!(env->i)) { else if (!(env->i)) {
n += snprintf(buff + n, bufsiz - n, "environment internal struct is null\n"); n += snprintf(buff + n, bufsiz - n, "environment internal struct is null\n");
} }
else if (!env_opened(env)) { else if (!env_opened(env)) {
n += snprintf(buff + n, bufsiz - n, "environment is not open\n"); n += snprintf(buff + n, bufsiz - n, "environment is not open\n");
...@@ -2025,7 +2025,7 @@ static int ...@@ -2025,7 +2025,7 @@ static int
toku_maybe_get_engine_status_text (char * buff, int buffsize) { toku_maybe_get_engine_status_text (char * buff, int buffsize) {
DB_ENV * env = most_recent_env; DB_ENV * env = most_recent_env;
int r; int r;
if (engine_status_enable) { if (engine_status_enable && env != NULL) {
r = env_get_engine_status_text(env, buff, buffsize); r = env_get_engine_status_text(env, buff, buffsize);
} }
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment