File tree Expand file tree Collapse file tree 1 file changed +4
-16
lines changed Expand file tree Collapse file tree 1 file changed +4
-16
lines changed Original file line number Diff line number Diff line change @@ -16,37 +16,25 @@ using ArduinoJson::detail::sizeofString;
16
16
17
17
class ArmoredAllocator : public Allocator {
18
18
public:
19
- ArmoredAllocator () : _ptr(0 ), _size(0 ) {}
20
19
virtual ~ArmoredAllocator () {}
21
20
22
21
void * allocate (size_t size) override {
23
- _ptr = malloc (size);
24
- _size = size;
25
- return _ptr;
22
+ return malloc (size);
26
23
}
27
24
28
25
void deallocate (void * ptr) override {
29
- REQUIRE (ptr == _ptr);
30
26
free (ptr);
31
- _ptr = 0 ;
32
- _size = 0 ;
33
27
}
34
28
35
29
void * reallocate (void * ptr, size_t new_size) override {
36
- REQUIRE (ptr == _ptr);
37
30
// don't call realloc, instead alloc a new buffer and erase the old one
38
31
// this way we make sure we support relocation
39
32
void * new_ptr = malloc (new_size);
40
- memcpy (new_ptr, _ptr, std::min (new_size, _size));
41
- memset (_ptr, ' #' , _size); // erase
42
- free (_ptr);
43
- _ptr = new_ptr;
33
+ memset (new_ptr, ' #' , new_size); // erase
34
+ memcpy (new_ptr, ptr, std::min (new_size, new_size));
35
+ free (ptr);
44
36
return new_ptr;
45
37
}
46
-
47
- private:
48
- void * _ptr;
49
- size_t _size;
50
38
};
51
39
52
40
TEST_CASE (" JsonDocument::shrinkToFit()" ) {
You can’t perform that action at this time.
0 commit comments