Revision 1886043

Merge r1886019 from trunk:

 * r1886019
   Fix a potential NULL dereference in the config file parser.
   Justification:
     Missing return value check. C is hard.
   Votes:
     +1: stsp, hartmannathan, jcorvel