Skip to content

Commit

Permalink
Merge pull request #780 from m-tmatma/feature/fix-bug-CNative-Clear
Browse files Browse the repository at this point in the history
バッファが空の状態で CNativeW::Clear を呼び出したときに落ちる不具合修正
  • Loading branch information
m-tmatma authored Feb 3, 2019
2 parents 4245d6e + d7c31ca commit e225bc1
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 0 deletions.
1 change: 1 addition & 0 deletions sakura_core/mem/CMemory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ void CMemory::_init_members()
CMemory::CMemory()
{
_init_members();
SetRawData( NULL, 0 );
}

/*
Expand Down
37 changes: 37 additions & 0 deletions tests/unittests/test-cmemory.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*! @file */
/*
Copyright (C) 2018-2019 Sakura Editor Organization
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented;
you must not claim that you wrote the original software.
If you use this software in a product, an acknowledgment
in the product documentation would be appreciated but is
not required.
2. Altered source versions must be plainly marked as such,
and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
*/
#include <gtest/gtest.h>
#include "mem/CMemory.h"

/*!
_SetRawLength(0) を呼び出して落ちないことを確認する
*/
TEST(CMemory, SetRawLengthToZero)
{
CMemory memory;

// _SetRawLength(0) を呼び出して落ちないことを確認する
memory._SetRawLength(0);
}
5 changes: 5 additions & 0 deletions tests/unittests/test-cnative.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
/*!
CNativeW::Clear のデータサイズのクリアをテストする
0. バッファが空の状態でクリアする
1-1. 固定データを追加する
1-2. バッファの状態を取得する
1-3. バッファの状態をチェックする
Expand All @@ -47,6 +49,9 @@ TEST(CNativeW, Clear)
constexpr const int fixedPatternLen = 3;

CNativeW stringW;

// 0. バッファが空の状態でクリアする
stringW.Clear();

// 1-1. 固定データを追加する

Expand Down

0 comments on commit e225bc1

Please sign in to comment.