[fixed] pointer arithmetic warning
[fixed] stability issue

Change-Id: I581f155a0717b6a59e3b8fde35c366107f506a97