From 41c9e90cce2d6ccf1923153a146e62083d8b46e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 12 Oct 2018 09:40:21 +0200 Subject: [PATCH] [shared] StorageCartesianFunction: fix DefaultName --- apps/shared/storage_cartesian_function.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/shared/storage_cartesian_function.cpp b/apps/shared/storage_cartesian_function.cpp index b70ff1249..ef0f295c4 100644 --- a/apps/shared/storage_cartesian_function.cpp +++ b/apps/shared/storage_cartesian_function.cpp @@ -19,7 +19,7 @@ void StorageCartesianFunction::DefaultName(char buffer[], size_t bufferSize) { // Find the next available number int currentNumber = 0; int currentNumberLength = -1; - size_t availableBufferSize = bufferSize - constantNameLength; + int availableBufferSize = bufferSize - constantNameLength; while (currentNumberLength < availableBufferSize) { currentNumberLength = Poincare::Integer(currentNumber).serialize(&buffer[1], availableBufferSize); if (GlobalContext::RecordBaseNameIsFree(buffer)) { @@ -28,7 +28,7 @@ void StorageCartesianFunction::DefaultName(char buffer[], size_t bufferSize) { } currentNumber++; } - assert(currentNumberLength > 1 && currentNumberLength < availableBufferSize); + assert(currentNumberLength > 0 && currentNumberLength < availableBufferSize); // Write the extension int dotCharIndex = 1 + currentNumberLength; buffer[dotCharIndex] = Ion::Storage::k_dotChar;