From ce247a563788a2ca9b3e91d85a6c48561ae943ce Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 21 Jun 2019 08:46:05 +0200 Subject: [PATCH] Fixed `serialized()` not working with Flash strings (fixes #1030) --- CHANGELOG.md | 5 +++++ src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7eae0ec9..eba72b0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ ArduinoJson: change log ======================= +HEAD +---- + +* Fixed `serialized()` not working with Flash strings (issue #1030) + v6.11.0 (2019-05-26) ------- diff --git a/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp b/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp index 0bddf4aa..323078af 100644 --- a/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp +++ b/src/ArduinoJson/Strings/SizedFlashStringAdapter.hpp @@ -29,7 +29,7 @@ class SizedFlashStringAdapter { char* save(MemoryPool* pool) const { if (!_str) return NULL; char* dup = pool->allocFrozenString(_size); - if (!dup) memcpy_P(dup, (const char*)_str, _size); + if (dup) memcpy_P(dup, (const char*)_str, _size); return dup; }