diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2015-02-16 05:26:40 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2015-02-16 05:26:40 +0100 |
| commit | 5fc2f57fb5520bb61e2c1f8b6fd2522b203b3b9d (patch) | |
| tree | 5b318c5ebedda4c12833f3b8998fe2b3c56971aa /nx-X11/lib/font/fc/fsconvert.c | |
| parent | 1ea1cd8c4f93b0c03e5b34fe174b3fc9f27c7dfa (diff) | |
| download | nx-libs-5fc2f57fb5520bb61e2c1f8b6fd2522b203b3b9d.tar.gz nx-libs-5fc2f57fb5520bb61e2c1f8b6fd2522b203b3b9d.tar.bz2 nx-libs-5fc2f57fb5520bb61e2c1f8b6fd2522b203b3b9d.zip | |
Revert "CVE-2014-0210: unvalidated length fields in fs_read_query_info() from xorg/lib/libXfont commit 491291cabf78efdeec8f18b09e14726a9030cc8f"
This reverts commit c6aebf9284855a0e24ad9c5ffdd36aa65e16bec7.
Diffstat (limited to 'nx-X11/lib/font/fc/fsconvert.c')
| -rw-r--r-- | nx-X11/lib/font/fc/fsconvert.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/nx-X11/lib/font/fc/fsconvert.c b/nx-X11/lib/font/fc/fsconvert.c index afa2c3284..9a5e194d1 100644 --- a/nx-X11/lib/font/fc/fsconvert.c +++ b/nx-X11/lib/font/fc/fsconvert.c @@ -123,10 +123,6 @@ _fs_convert_props(fsPropInfo *pi, fsPropOffset *po, pointer pd, for (i = 0; i < nprops; i++, dprop++, is_str++) { memcpy(&local_off, off_adr, SIZEOF(fsPropOffset)); - if ((local_off.name.position >= pi->data_len) || - (local_off.name.length > - (pi->data_len - local_off.name.position))) - goto bail; dprop->name = MakeAtom(&pdc[local_off.name.position], local_off.name.length, 1); if (local_off.type != PropTypeString) { @@ -134,20 +130,15 @@ _fs_convert_props(fsPropInfo *pi, fsPropOffset *po, pointer pd, dprop->value = local_off.value.position; } else { *is_str = TRUE; - if ((local_off.value.position >= pi->data_len) || - (local_off.value.length > - (pi->data_len - local_off.value.position))) - goto bail; dprop->value = (INT32) MakeAtom(&pdc[local_off.value.position], local_off.value.length, 1); if (dprop->value == BAD_RESOURCE) { - bail: - xfree (pfi->props); - pfi->nprops = 0; - pfi->props = 0; - pfi->isStringProp = 0; - return -1; + xfree (pfi->props); + pfi->nprops = 0; + pfi->props = 0; + pfi->isStringProp = 0; + return -1; } } off_adr += SIZEOF(fsPropOffset); |