[PATCH] String copy limiting fixes