|
Line
Link Here
|
| 0 |
-- xorg-server-1.14.3/dix/dixfonts.c |
0 |
++ xorg-server-1.14.3/dix/dixfonts.c |
|
Lines 1425-1430
Link Here
|
| 1425 |
GC *pGC; |
1425 |
GC *pGC; |
| 1426 |
unsigned char *data; |
1426 |
unsigned char *data; |
| 1427 |
ITclosurePtr new_closure; |
1427 |
ITclosurePtr new_closure; |
|
|
1428 |
ITclosurePtr old_closure; |
| 1428 |
|
1429 |
|
| 1429 |
/* We're putting the client to sleep. We need to |
1430 |
/* We're putting the client to sleep. We need to |
| 1430 |
save some state. Similar problem to that handled |
1431 |
save some state. Similar problem to that handled |
|
Lines 1436-1447
Link Here
|
| 1436 |
err = BadAlloc; |
1437 |
err = BadAlloc; |
| 1437 |
goto bail; |
1438 |
goto bail; |
| 1438 |
} |
1439 |
} |
|
|
1440 |
old_closure = c; |
| 1439 |
*new_closure = *c; |
1441 |
*new_closure = *c; |
| 1440 |
c = new_closure; |
1442 |
c = new_closure; |
| 1441 |
|
1443 |
|
| 1442 |
data = malloc(c->nChars * itemSize); |
1444 |
data = malloc(c->nChars * itemSize); |
| 1443 |
if (!data) { |
1445 |
if (!data) { |
| 1444 |
free(c); |
1446 |
free(c); |
|
|
1447 |
c = old_closure; |
| 1445 |
err = BadAlloc; |
1448 |
err = BadAlloc; |
| 1446 |
goto bail; |
1449 |
goto bail; |
| 1447 |
} |
1450 |
} |
|
Lines 1452-1457
Link Here
|
| 1452 |
if (!pGC) { |
1455 |
if (!pGC) { |
| 1453 |
free(c->data); |
1456 |
free(c->data); |
| 1454 |
free(c); |
1457 |
free(c); |
|
|
1458 |
c = old_closure; |
| 1455 |
err = BadAlloc; |
1459 |
err = BadAlloc; |
| 1456 |
goto bail; |
1460 |
goto bail; |
| 1457 |
} |
1461 |
} |
|
Lines 1464-1469
Link Here
|
| 1464 |
FreeScratchGC(pGC); |
1468 |
FreeScratchGC(pGC); |
| 1465 |
free(c->data); |
1469 |
free(c->data); |
| 1466 |
free(c); |
1470 |
free(c); |
|
|
1471 |
c = old_closure; |
| 1467 |
err = BadAlloc; |
1472 |
err = BadAlloc; |
| 1468 |
goto bail; |
1473 |
goto bail; |
| 1469 |
} |
1474 |
} |
