diff options
| author | Paul Eggert | 2011-06-15 12:57:25 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-15 12:57:25 -0700 |
| commit | a7af7fdede602a111401c2352e81311a9dc38b99 (patch) | |
| tree | daebcb8a73345231337d0a461c01ae7804b2b646 /src/widget.c | |
| parent | 8c9b210626493dd93f236d7fb312c4f6dba62892 (diff) | |
| parent | b1c46f026de9d185ba86ffb1b23c50f2bd095ccf (diff) | |
| download | emacs-a7af7fdede602a111401c2352e81311a9dc38b99.tar.gz emacs-a7af7fdede602a111401c2352e81311a9dc38b99.zip | |
Integer overflow and signedness fixes (Bug#8873).
Diffstat (limited to 'src/widget.c')
| -rw-r--r-- | src/widget.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/widget.c b/src/widget.c index 7d32e30eed7..6d871ad7cb2 100644 --- a/src/widget.c +++ b/src/widget.c | |||
| @@ -516,14 +516,11 @@ create_frame_gcs (ew) | |||
| 516 | struct frame *s = ew->emacs_frame.frame; | 516 | struct frame *s = ew->emacs_frame.frame; |
| 517 | 517 | ||
| 518 | s->output_data.x->normal_gc | 518 | s->output_data.x->normal_gc |
| 519 | = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), | 519 | = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0); |
| 520 | (unsigned long)0, (XGCValues *)0); | ||
| 521 | s->output_data.x->reverse_gc | 520 | s->output_data.x->reverse_gc |
| 522 | = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), | 521 | = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0); |
| 523 | (unsigned long)0, (XGCValues *)0); | ||
| 524 | s->output_data.x->cursor_gc | 522 | s->output_data.x->cursor_gc |
| 525 | = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), | 523 | = XCreateGC (XtDisplay (ew), RootWindowOfScreen (XtScreen (ew)), 0, 0); |
| 526 | (unsigned long)0, (XGCValues *)0); | ||
| 527 | s->output_data.x->black_relief.gc = 0; | 524 | s->output_data.x->black_relief.gc = 0; |
| 528 | s->output_data.x->white_relief.gc = 0; | 525 | s->output_data.x->white_relief.gc = 0; |
| 529 | } | 526 | } |
| @@ -582,8 +579,7 @@ setup_frame_gcs (EmacsFrame ew) | |||
| 582 | = XCreatePixmapFromBitmapData (XtDisplay(ew), | 579 | = XCreatePixmapFromBitmapData (XtDisplay(ew), |
| 583 | RootWindowOfScreen (XtScreen (ew)), | 580 | RootWindowOfScreen (XtScreen (ew)), |
| 584 | setup_frame_cursor_bits, 2, 2, | 581 | setup_frame_cursor_bits, 2, 2, |
| 585 | (unsigned long)0, (unsigned long)1, | 582 | 0, 1, ew->core.depth); |
| 586 | ew->core.depth); | ||
| 587 | 583 | ||
| 588 | /* Normal video */ | 584 | /* Normal video */ |
| 589 | gc_values.foreground = ew->emacs_frame.foreground_pixel; | 585 | gc_values.foreground = ew->emacs_frame.foreground_pixel; |