Skip to content
This repository has been archived by the owner on Jun 7, 2021. It is now read-only.

[TRAFODION-2170] certain create table DDL will fail with core dump #834

Merged
merged 1 commit into from
Nov 16, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions core/sqf/src/tm/tmddlrequests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ JNIEXPORT jint JNICALL Java_org_apache_hadoop_hbase_client_transactional_RMInter
char la_tbldesc[TM_MAX_DDLREQUEST_STRING];
char la_tblname[TM_MAX_DDLREQUEST_STRING];
char* str_key;
str_key = new char[TM_MAX_DDLREQUEST_STRING];
str_key = new char[pv_keyLength];
char** la_keys;
la_keys = new char *[TM_MAX_DDLREQUEST_STRING];
int lv_error = FEOK;
Expand All @@ -51,9 +51,9 @@ JNIEXPORT jint JNICALL Java_org_apache_hadoop_hbase_client_transactional_RMInter
}
else {
int lv_tbldesc_length = pp_env->GetArrayLength(pv_tableDescriptor);
memset(la_tbldesc, 0, lv_tbldesc_length);
memset(la_tbldesc, 0, lv_tbldesc_length < TM_MAX_DDLREQUEST_STRING ? lv_tbldesc_length : TM_MAX_DDLREQUEST_STRING );
jbyte *lp_tbldesc = pp_env->GetByteArrayElements(pv_tableDescriptor, 0);
memcpy(la_tbldesc, lp_tbldesc, lv_tbldesc_length);
memcpy(la_tbldesc, lp_tbldesc, lv_tbldesc_length < TM_MAX_DDLREQUEST_STRING ? lv_tbldesc_length : TM_MAX_DDLREQUEST_STRING -1);

memset(la_tblname, 0, lv_tblname_len < TM_MAX_DDLREQUEST_STRING ? lv_tblname_len : TM_MAX_DDLREQUEST_STRING);
jbyte *lp_tblname = pp_env->GetByteArrayElements(pv_tblname, 0);
Expand Down Expand Up @@ -82,6 +82,8 @@ JNIEXPORT jint JNICALL Java_org_apache_hadoop_hbase_client_transactional_RMInter
pp_env->ReleaseByteArrayElements(pv_tableDescriptor, lp_tbldesc, 0);
pp_env->ReleaseByteArrayElements(pv_tblname, lp_tblname, 0);
}
delete [] la_keys;
delete str_key;
return lv_error;
}

Expand Down