diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-05 08:53:26 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-05 08:53:26 +0000 |
| commit | cc77964c3e6134a6b2257501fd1b79c4330af4ea (patch) | |
| tree | e14802773c408bec37d75793b7074fd67160dc00 | |
| parent | 775bda16a3c02aca323df58bcc639e90e87fa789 (diff) | |
| download | hercules-cc77964c3e6134a6b2257501fd1b79c4330af4ea.tar.gz hercules-cc77964c3e6134a6b2257501fd1b79c4330af4ea.tar.bz2 hercules-cc77964c3e6134a6b2257501fd1b79c4330af4ea.tar.xz hercules-cc77964c3e6134a6b2257501fd1b79c4330af4ea.zip | |
* Fixed possible crash in script_reportdata, when a script string becomes NULL.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14731 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 36680b74f..002187b42 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/03/05 + * Fixed possible crash in script_reportdata, when a script string becomes NULL for whatever reason. [Ai4rei] 2011/03/04 * Fixed recursive map_quit invocation when a buying store is auto-closed (login when @autotrade/logout) (bugreport:4796, since r14724). [Ai4rei] 2011/03/02 diff --git a/src/map/script.c b/src/map/script.c index d66edcd84..a90d03806 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -483,7 +483,14 @@ static void script_reportdata(struct script_data* data) break; case C_STR: case C_CONSTSTR:// string - ShowDebug("Data: string value=\"%s\"\n", data->u.str); + if( data->u.str ) + { + ShowDebug("Data: string value=\"%s\"\n", data->u.str); + } + else + { + ShowDebug("Data: string value=NULL\n"); + } break; case C_NAME:// reference if( reference_tovariable(data) ) |