[apps/ion] Escapes cases when records/ strings are null

This commit is contained in:
Léa Saviot
2018-10-09 16:02:58 +02:00
committed by Émilie Feral
parent c95136c9b5
commit d869be7782
3 changed files with 8 additions and 11 deletions

View File

@@ -40,7 +40,7 @@ void StorageExpressionModel::text(char * buffer, size_t bufferSize) const {
}
Expression StorageExpressionModel::expression() const {
if (m_expression.isUninitialized()) {
if (m_expression.isUninitialized() && !m_record.isNull()) {
m_expression = Expression::ExpressionFromAddress(expressionAddress(), expressionSize());
}
return m_expression;
@@ -51,7 +51,7 @@ Expression StorageExpressionModel::reducedExpression(Poincare::Context * context
}
Layout StorageExpressionModel::layout() {
if (m_layout.isUninitialized()) {
if (m_layout.isUninitialized() && !m_record.isNull()) {
m_layout = PoincareHelpers::CreateLayout(expression());
if (m_layout.isUninitialized()) {
m_layout = HorizontalLayout();