Merge "fix for buffer overflow" into tizen