Error when reading an ill-formed RPC file (double ^M line ending)

[bugbuster]

Gdalinfo displays an error while reading an RPC file :

gdalinfo po_1471778_bgrn_0000000.small_tif
Driver: GTiff/GeoTIFF
ERROR 1: po_1471778_bgrn_0000000_rpc.txt file found, but missing SAMP_NUM_COEFF_1 field (and possibly others).
Files: po_1471778_bgrn_0000000.small_tif
       po_1471778_bgrn_0000000_rpc.txt
Size is 63, 63
...

This data is an Ikonos product. The problem comes from an "ill-formed" RPC file : if you look carefully, each line is ended with a double "^M".

LINE_OFF: +003154.00 pixels^M^M
SAMP_OFF: +003154.00 pixels^M^M
...

I know that a dos2unix solves the problem. However, it is not always possible to modify the input data.
Could it be possible to make the GDALLoadRPBFile() function (gdal_rpcimdio.cpp) more robust against such ill-formed files ?

[bugbuster]

TIF image with RPC file

[Even Rouault]

trunk r33193, branches/2.0 r33194, branches/1.11 r33195 "GDALLoadRPCFile(): load .rpc files from Ikonos products that have extra end-of-line character (#6341)"