Skip to content

Commit 934cc86

Browse files
committed
Assert that filepath strings are not null
1 parent 9765e30 commit 934cc86

File tree

5 files changed

+14
-0
lines changed

5 files changed

+14
-0
lines changed

src/CSFML/Audio/Music.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
////////////////////////////////////////////////////////////
3434
sfMusic* sfMusic_createFromFile(const char* filename)
3535
{
36+
assert(filename);
37+
3638
auto* music = new sfMusic;
3739
if (!music->This.openFromFile(filename))
3840
{

src/CSFML/Audio/SoundBuffer.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
////////////////////////////////////////////////////////////
3434
sfSoundBuffer* sfSoundBuffer_createFromFile(const char* filename)
3535
{
36+
assert(filename);
37+
3638
sf::SoundBuffer soundBuffer;
3739
if (!soundBuffer.loadFromFile(filename))
3840
return nullptr;
@@ -106,6 +108,7 @@ void sfSoundBuffer_destroy(const sfSoundBuffer* soundBuffer)
106108
bool sfSoundBuffer_saveToFile(const sfSoundBuffer* soundBuffer, const char* filename)
107109
{
108110
assert(soundBuffer);
111+
assert(filename);
109112
return soundBuffer->This.saveToFile(filename);
110113
}
111114

src/CSFML/Graphics/Font.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
////////////////////////////////////////////////////////////
3535
sfFont* sfFont_createFromFile(const char* filename)
3636
{
37+
assert(filename);
38+
3739
sf::Font font;
3840
if (!font.openFromFile(filename))
3941
return nullptr;

src/CSFML/Graphics/Image.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ sfImage* sfImage_createFromPixels(sfVector2u size, const uint8_t* data)
5858
////////////////////////////////////////////////////////////
5959
sfImage* sfImage_createFromFile(const char* filename)
6060
{
61+
assert(filename);
62+
6163
sf::Image image;
6264
if (!image.loadFromFile(filename))
6365
return nullptr;
@@ -110,6 +112,7 @@ void sfImage_destroy(const sfImage* image)
110112
bool sfImage_saveToFile(const sfImage* image, const char* filename)
111113
{
112114
assert(image);
115+
assert(filename);
113116
return image->This.saveToFile(filename);
114117
}
115118

src/CSFML/Graphics/Texture.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ sfTexture* sfTexture_create(sfVector2u size)
5353
////////////////////////////////////////////////////////////
5454
sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area)
5555
{
56+
assert(filename);
57+
5658
auto* texture = new sfTexture;
5759

5860
const sf::IntRect rect = area ? convertRect(*area) : sf::IntRect();
@@ -69,6 +71,8 @@ sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area)
6971
////////////////////////////////////////////////////////////
7072
sfTexture* sfTexture_createSrgbFromFile(const char* filename, const sfIntRect* area)
7173
{
74+
assert(filename);
75+
7276
auto* texture = new sfTexture;
7377

7478
const sf::IntRect rect = area ? convertRect(*area) : sf::IntRect();

0 commit comments

Comments
 (0)