mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 05:26:13 +01:00
Assert that filepath strings are not null
This commit is contained in:
1 parent
9765e30e2f
commit
21d4571d5b
5 files changed
+14
No files matched your search
@@ -33,6 +33,8 @@
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
sfMusic* sfMusic_createFromFile(const char* filename)
|
sfMusic* sfMusic_createFromFile(const char* filename)
|
||||||
{
|
{
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
auto* music = new sfMusic;
|
auto* music = new sfMusic;
|
||||||
if (!music->This.openFromFile(filename))
|
if (!music->This.openFromFile(filename))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -33,6 +33,8 @@
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
sfSoundBuffer* sfSoundBuffer_createFromFile(const char* filename)
|
sfSoundBuffer* sfSoundBuffer_createFromFile(const char* filename)
|
||||||
{
|
{
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
sf::SoundBuffer soundBuffer;
|
sf::SoundBuffer soundBuffer;
|
||||||
if (!soundBuffer.loadFromFile(filename))
|
if (!soundBuffer.loadFromFile(filename))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@@ -106,6 +108,7 @@ void sfSoundBuffer_destroy(const sfSoundBuffer* soundBuffer)
|
|||||||
bool sfSoundBuffer_saveToFile(const sfSoundBuffer* soundBuffer, const char* filename)
|
bool sfSoundBuffer_saveToFile(const sfSoundBuffer* soundBuffer, const char* filename)
|
||||||
{
|
{
|
||||||
assert(soundBuffer);
|
assert(soundBuffer);
|
||||||
|
assert(filename);
|
||||||
return soundBuffer->This.saveToFile(filename);
|
return soundBuffer->This.saveToFile(filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,8 @@
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
sfFont* sfFont_createFromFile(const char* filename)
|
sfFont* sfFont_createFromFile(const char* filename)
|
||||||
{
|
{
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
sf::Font font;
|
sf::Font font;
|
||||||
if (!font.openFromFile(filename))
|
if (!font.openFromFile(filename))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|||||||
@@ -58,6 +58,8 @@ sfImage* sfImage_createFromPixels(sfVector2u size, const uint8_t* data)
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
sfImage* sfImage_createFromFile(const char* filename)
|
sfImage* sfImage_createFromFile(const char* filename)
|
||||||
{
|
{
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
sf::Image image;
|
sf::Image image;
|
||||||
if (!image.loadFromFile(filename))
|
if (!image.loadFromFile(filename))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
@@ -110,6 +112,7 @@ void sfImage_destroy(const sfImage* image)
|
|||||||
bool sfImage_saveToFile(const sfImage* image, const char* filename)
|
bool sfImage_saveToFile(const sfImage* image, const char* filename)
|
||||||
{
|
{
|
||||||
assert(image);
|
assert(image);
|
||||||
|
assert(filename);
|
||||||
return image->This.saveToFile(filename);
|
return image->This.saveToFile(filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ sfTexture* sfTexture_create(sfVector2u size)
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area)
|
sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area)
|
||||||
{
|
{
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
auto* texture = new sfTexture;
|
auto* texture = new sfTexture;
|
||||||
|
|
||||||
const sf::IntRect rect = area ? convertRect(*area) : sf::IntRect();
|
const sf::IntRect rect = area ? convertRect(*area) : sf::IntRect();
|
||||||
@@ -69,6 +71,8 @@ sfTexture* sfTexture_createFromFile(const char* filename, const sfIntRect* area)
|
|||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
sfTexture* sfTexture_createSrgbFromFile(const char* filename, const sfIntRect* area)
|
sfTexture* sfTexture_createSrgbFromFile(const char* filename, const sfIntRect* area)
|
||||||
{
|
{
|
||||||
|
assert(filename);
|
||||||
|
|
||||||
auto* texture = new sfTexture;
|
auto* texture = new sfTexture;
|
||||||
|
|
||||||
const sf::IntRect rect = area ? convertRect(*area) : sf::IntRect();
|
const sf::IntRect rect = area ? convertRect(*area) : sf::IntRect();
|
||||||
|
|||||||
Reference in new issue
Block a user