← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xserver-xorg-video-sis/trusty

« back to all changes in this revision

Viewing changes to src/sis_video.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois
  • Date: 2012-05-01 19:17:28 UTC
  • mfrom: (4.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20120501191728-lin26r5cjg0kfo1k
Tags: 1:0.10.4-1
* New upstream release:
  - Fix FTBFS with X server 1.12.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sis_video.c
326
326
       if(newAdaptor)     size++;
327
327
       if(newBlitAdaptor) size++;
328
328
 
329
 
       newAdaptors = xalloc(size * sizeof(XF86VideoAdaptorPtr*));
 
329
       newAdaptors = malloc(size * sizeof(XF86VideoAdaptorPtr*));
330
330
       if(newAdaptors) {
331
331
          if(num_adaptors) {
332
332
             memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
356
356
    }
357
357
 
358
358
    if(newAdaptors) {
359
 
       xfree(newAdaptors);
 
359
       free(newAdaptors);
360
360
    }
361
361
}
362
362
 
877
877
    }
878
878
#endif
879
879
 
880
 
    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
 
880
    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
881
881
                            sizeof(SISPortPrivRec) +
882
882
                            sizeof(DevUnion)))) {
883
883
       return NULL;
4067
4067
   }
4068
4068
#endif
4069
4069
 
4070
 
   if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
 
4070
   if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
4071
4071
                           (sizeof(DevUnion) * NUM_BLIT_PORTS) +
4072
4072
                           sizeof(SISBPortPrivRec)))) {
4073
4073
      return NULL;