The ending line numbers and ending char numbers are being set properly in the CDT parser.
Made changes to CDTParser.java and DOMImage.java to resolve this.