diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-03-31 12:34:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-04-09 11:52:34 +0300 |
| commit | d57016b84dae3f51468bf52a3784a440af93bbb7 (patch) | |
| tree | aad72f109618bc27494c324bd695014dbed7cdcd | |
| parent | 9b5bb84f693a19ff119af01fc0d4953e59ac583e (diff) | |
| download | hercules-d57016b84dae3f51468bf52a3784a440af93bbb7.tar.gz hercules-d57016b84dae3f51468bf52a3784a440af93bbb7.tar.bz2 hercules-d57016b84dae3f51468bf52a3784a440af93bbb7.tar.xz hercules-d57016b84dae3f51468bf52a3784a440af93bbb7.zip | |
Add checks to int_storage.c
| -rw-r--r-- | src/char/int_storage.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/char/int_storage.c b/src/char/int_storage.c index db49eb46e..7afafc406 100644 --- a/src/char/int_storage.c +++ b/src/char/int_storage.c @@ -16,6 +16,7 @@ #include "mapif.h" #include "../common/malloc.h" #include "../common/mmo.h" +#include "../common/nullpo.h" #include "../common/showmsg.h" #include "../common/socket.h" #include "../common/sql.h" @@ -28,6 +29,7 @@ struct inter_storage_interface inter_storage_s; /// Save storage data to sql int inter_storage_tosql(int account_id, struct storage_data* p) { + nullpo_ret(p); chr->memitemdata_to_sql(p->items, MAX_STORAGE, account_id, TABLE_STORAGE); return 0; } @@ -40,6 +42,7 @@ int inter_storage_fromsql(int account_id, struct storage_data* p) int i; int j; + nullpo_ret(p); memset(p, 0, sizeof(struct storage_data)); //clean up memory p->storage_amount = 0; @@ -82,6 +85,7 @@ int inter_storage_fromsql(int account_id, struct storage_data* p) /// Save guild_storage data to sql int inter_storage_guild_storage_tosql(int guild_id, struct guild_storage* p) { + nullpo_ret(p); chr->memitemdata_to_sql(p->items, MAX_GUILD_STORAGE, guild_id, TABLE_GUILD_STORAGE); ShowInfo ("guild storage save to DB - guild: %d\n", guild_id); return 0; @@ -95,6 +99,7 @@ int inter_storage_guild_storage_fromsql(int guild_id, struct guild_storage* p) int i; int j; + nullpo_ret(p); memset(p, 0, sizeof(struct guild_storage)); //clean up memory p->storage_amount = 0; p->guild_id = guild_id; @@ -297,7 +302,8 @@ int mapif_parse_ItemBoundRetrieve_sub(int fd) for( j = 0; j < MAX_SLOTS; ++j ) SQL->StmtBindColumn(stmt, 10+j, SQLDT_SHORT, &item.card[j], 0, NULL, NULL); - while( SQL_SUCCESS == SQL->StmtNextRow(stmt) ) { + while( SQL_SUCCESS == SQL->StmtNextRow(stmt)) { + Assert_retb(i >= MAX_INVENTORY); memcpy(&items[i],&item,sizeof(struct item)); i++; } |