diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
| commit | 30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea (patch) | |
| tree | 7ae924e3fb64c93a0f59e55fd08a914db9bb551b /xorg-server/hw/xfree86/ddc | |
| parent | 55a9a54c65cd0ff58966408ea4d7879a3d9c749c (diff) | |
| parent | 176eab9e8277db1549bfc6c9ae805c4e1858f0b0 (diff) | |
| download | vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.gz vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.bz2 vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xserver git update 25 Mar 2013
Diffstat (limited to 'xorg-server/hw/xfree86/ddc')
| -rw-r--r-- | xorg-server/hw/xfree86/ddc/ddc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xorg-server/hw/xfree86/ddc/ddc.c b/xorg-server/hw/xfree86/ddc/ddc.c index 28c969646..44c1d535c 100644 --- a/xorg-server/hw/xfree86/ddc/ddc.c +++ b/xorg-server/hw/xfree86/ddc/ddc.c @@ -91,15 +91,16 @@ resort(unsigned char *s_block) unsigned char *d_new, *d_ptr, *d_end, *s_ptr, *s_end; unsigned char tmp; + s_ptr = find_header(s_block); + if (!s_ptr) + return NULL; s_end = s_block + EDID1_LEN; + d_new = malloc(EDID1_LEN); if (!d_new) return NULL; d_end = d_new + EDID1_LEN; - s_ptr = find_header(s_block); - if (!s_ptr) - return NULL; for (d_ptr = d_new; d_ptr < d_end; d_ptr++) { tmp = *(s_ptr++); *d_ptr = tmp; |