diff options
| author | Haru <haru@dotalux.com> | 2020-05-10 20:35:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 20:35:59 +0200 |
| commit | 0d66a7243aa6e129cddea4ca09c2616354c23ffa (patch) | |
| tree | 56fe416e50f56c2265d72b920efd238538ac22ab /src/login | |
| parent | 944d8489f1bcca93e6b2ff06a159084f064dce12 (diff) | |
| parent | 66f9a2a1bc2fd509d13729ad6bc586a3b7ad2347 (diff) | |
| download | hercules-0d66a7243aa6e129cddea4ca09c2616354c23ffa.tar.gz hercules-0d66a7243aa6e129cddea4ca09c2616354c23ffa.tar.bz2 hercules-0d66a7243aa6e129cddea4ca09c2616354c23ffa.tar.xz hercules-0d66a7243aa6e129cddea4ca09c2616354c23ffa.zip | |
Merge pull request #2705 from Kenpachi2k13/string_var_size
Cap string variable value length and unify corresponding SQL columns size
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/account.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/login/account.c b/src/login/account.c index 3632c257a..ec0bc81e8 100644 --- a/src/login/account.c +++ b/src/login/account.c @@ -632,7 +632,8 @@ static void account_mmo_save_accreg2(AccountDB *self, int fd, int account_id, in sql_handle = db->accounts; if (count) { int cursor = 14, i; - char key[SCRIPT_VARNAME_LENGTH+1], sval[254]; + char key[SCRIPT_VARNAME_LENGTH + 1]; + char sval[SCRIPT_STRING_VAR_LENGTH + 1]; for (i = 0; i < count; i++) { unsigned int index; @@ -657,8 +658,8 @@ static void account_mmo_save_accreg2(AccountDB *self, int fd, int account_id, in /* str */ case 2: len = RFIFOB(fd, cursor); - safestrncpy(sval, RFIFOP(fd, cursor + 1), min((int)sizeof(sval), len)); - cursor += len + 1; + safestrncpy(sval, RFIFOP(fd, cursor + 1), min((int)sizeof(sval), len + 1)); + cursor += len + 2; if( SQL_ERROR == SQL->Query(sql_handle, "REPLACE INTO `%s` (`account_id`,`key`,`index`,`value`) VALUES ('%d','%s','%u','%s')", db->global_acc_reg_str_db, account_id, key, index, sval) ) Sql_ShowDebug(sql_handle); break; @@ -719,13 +720,13 @@ static void account_mmo_send_accreg2(AccountDB *self, int fd, int account_id, in plen += 4; SQL->GetData(sql_handle, 2, &data, NULL); - len = strlen(data)+1; + len = strlen(data); - WFIFOB(fd, plen) = (unsigned char)len;/* won't be higher; the column size is 254 */ + WFIFOB(fd, plen) = (unsigned char)len; // Won't be higher; the column size is 255. plen += 1; - safestrncpy(WFIFOP(fd,plen), data, len); - plen += len; + safestrncpy(WFIFOP(fd, plen), data, len + 1); + plen += len + 1; WFIFOW(fd, 14) += 1; |