diff options
| author | Haru <haru@dotalux.com> | 2018-05-06 17:52:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 17:52:22 +0200 |
| commit | b889108f6dea3e1765681b9eaf4a39a18c24eeec (patch) | |
| tree | 40e2b55d2e4d1f4a38a0a36be7f9920dd9637ce4 /src/map/map.c | |
| parent | d6785d389cbee4f34078f6762626ca61b2d6cc25 (diff) | |
| parent | ed8fac40e2d6cbf11b9a4a1a8182cd28871e3e6d (diff) | |
| download | hercules-b889108f6dea3e1765681b9eaf4a39a18c24eeec.tar.gz hercules-b889108f6dea3e1765681b9eaf4a39a18c24eeec.tar.bz2 hercules-b889108f6dea3e1765681b9eaf4a39a18c24eeec.tar.xz hercules-b889108f6dea3e1765681b9eaf4a39a18c24eeec.zip | |
Merge pull request #2028 from 4144/warnings
Fix some possible buffer overflows.
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/map/map.c b/src/map/map.c index 90b304865..8386b3c3d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -5119,11 +5119,12 @@ bool map_zone_mf_cache(int m, char *flag, char *params) { } } else if (!strcmpi(flag,"adjust_unit_duration")) { int skill_id, k; - char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH]; - size_t len = strlen(params); + char skill_name[MAX_SKILL_NAME_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH]; + size_t len; modifier[0] = '\0'; - memcpy(skill_name, params, MAP_ZONE_MAPFLAG_LENGTH); + safestrncpy(skill_name, params, MAX_SKILL_NAME_LENGTH); + len = strlen(skill_name); for(k = 0; k < len; k++) { if( skill_name[k] == '\t' ) { @@ -5152,11 +5153,12 @@ bool map_zone_mf_cache(int m, char *flag, char *params) { } } else if (!strcmpi(flag,"adjust_skill_damage")) { int skill_id, k; - char skill_name[MAP_ZONE_MAPFLAG_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH]; - size_t len = strlen(params); + char skill_name[MAX_SKILL_NAME_LENGTH], modifier[MAP_ZONE_MAPFLAG_LENGTH]; + size_t len; modifier[0] = '\0'; - memcpy(skill_name, params, MAP_ZONE_MAPFLAG_LENGTH); + safestrncpy(skill_name, params, MAX_SKILL_NAME_LENGTH); + len = strlen(skill_name); for(k = 0; k < len; k++) { if( skill_name[k] == '\t' ) { |