[IOT-1319] Resolved potential buffer overflow case