From 2c5145517a48e0cdc57e588d9e327dac0a31128c Mon Sep 17 00:00:00 2001 From: bangerth Date: Thu, 30 Jun 2011 23:47:29 +0000 Subject: [PATCH] Be more careful accessing the data array of a Table object if said Table object is empty. Also add an assertion in one other place. git-svn-id: https://svn.dealii.org/trunk@23893 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/include/deal.II/base/table.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deal.II/include/deal.II/base/table.h b/deal.II/include/deal.II/base/table.h index 6bc0ca7fa5..1d835d9cce 100644 --- a/deal.II/include/deal.II/base/table.h +++ b/deal.II/include/deal.II/base/table.h @@ -2168,6 +2168,8 @@ inline typename std::vector::reference TableBase::el (const TableIndices &indices) { + Assert (position(indices) < values.size(), + ExcIndexRange (position(indices), 0, values.size())); return values[position(indices)]; } @@ -2178,7 +2180,10 @@ inline typename std::vector::const_pointer TableBase::data () const { - return &values[0]; + if (values.size() == 0) + return 0; + else + return &values[0]; } -- 2.39.5