← Back to branch summary

~vcs-imports/eglibc/trunk

« back to all changes in this revision

Viewing changes to libc/intl/loadmsgcat.c

  • Committer: joseph
  • Date: 2013-06-04 15:48:26 UTC
  • Revision ID: svn-v4:7b3dc134-2b1b-0410-93df-9e9f96275f8d:trunk:23218
Merge changes between r23097 and r23217 from /fsf/trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libc/intl/loadmsgcat.c
1237
1237
    default:
1238
1238
      /* This is an invalid revision.  */
1239
1239
    invalid:
1240
 
      /* This is an invalid .mo file.  */
 
1240
      /* This is an invalid .mo file or we ran out of resources.  */
1241
1241
      free (domain->malloced);
1242
1242
#ifdef HAVE_MMAP
1243
1243
      if (use_mmap)
1257
1257
 
1258
1258
  /* Get the header entry and look for a plural specification.  */
1259
1259
  nullentry = _nl_find_msg (domain_file, domainbinding, "", 0, &nullentrylen);
 
1260
  if (__builtin_expect (nullentry == (char *) -1, 0))
 
1261
    {
 
1262
      __libc_rwlock_fini (domain->conversions_lock);
 
1263
      goto invalid;
 
1264
    }
1260
1265
  EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals);
1261
1266
 
1262
1267
 out: