Two-dimensional modulation and instability of a short wave riding on a finite-amplitude long wave