Address #4042: Prevent out-of-range access in column matrix (#4231)

2019-03-08 17:11:42 -08:00
parent 331cd3e4f7
commit f83e62dca5
1 changed files with 2 additions and 1 deletions
--- a/src/common/column_matrix.h
+++ b/src/common/column_matrix.h
@@ -163,7 +163,8 @@ class ColumnMatrix {
     to determine type of bin id's */
  inline Column GetColumn(unsigned fid) const {
    Column c(type_[fid], &index_[boundary_[fid].index_begin], index_base_[fid],
-             &row_ind_[boundary_[fid].row_ind_begin],
+             (type_[fid] == ColumnType::kSparseColumn ?
+              &row_ind_[boundary_[fid].row_ind_begin] : nullptr),
             boundary_[fid].index_end - boundary_[fid].index_begin);
    return c;
  }