← Back to branch summary

~ubuntu-branches/ubuntu/wily/wine1.6/wily

« back to all changes in this revision

Viewing changes to .pc/0040-TESTING-override-pthreads-to-fix-gstreamer.patch/libs/wine/loader.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2014-03-17 17:43:36 UTC
  • mfrom: (1.1.1)
  • Revision ID: package-import@ubuntu.com-20140317174336-9we01jr5mzhomw16
Tags: 1:1.6.2-0ubuntu1
* New upstream release
  - Color management support updated to liblcms version 2.
  - Various bug fixes.
* Drop upstreamed patches for liblcms and freetype support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/0040-TESTING-override-pthreads-to-fix-gstreamer.patch/libs/wine/loader.c
917
917
    {
918
918
        if (pread( fd, magic, 2, 0 ) == 2 && magic[0] == 'M' && magic[1] == 'Z')
919
919
        {
920
 
            static const char msg[] = "MZ format";
921
 
            size_t len = min( errorsize, sizeof(msg) );
922
 
            memcpy( error, msg, len );
923
 
            error[len - 1] = 0;
 
920
            if (error && errorsize)
 
921
            {
 
922
                static const char msg[] = "MZ format";
 
923
                size_t len = min( errorsize, sizeof(msg) );
 
924
                memcpy( error, msg, len );
 
925
                error[len - 1] = 0;
 
926
            }
924
927
            close( fd );
925
928
            return NULL;
926
929
        }