… | |
… | |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
51 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
52 | static uid_t saved_euid; |
52 | static uid_t saved_euid; |
53 | static gid_t saved_egid; |
53 | static gid_t saved_egid; |
54 | #endif |
54 | #endif |
55 | |
55 | |
|
|
56 | bool |
|
|
57 | rxvt_tainted () |
|
|
58 | { |
|
|
59 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
|
|
60 | return getuid () != saved_euid || getgid () != saved_egid; |
|
|
61 | #else |
|
|
62 | return false; |
|
|
63 | #endif |
|
|
64 | } |
|
|
65 | |
56 | vector<rxvt_term *> rxvt_term::termlist; |
66 | vector<rxvt_term *> rxvt_term::termlist; |
57 | |
67 | |
58 | static char curlocale[128], savelocale[128]; |
68 | static char curlocale[128], savelocale[128]; |
59 | |
69 | |
60 | bool |
70 | bool |
… | |
… | |
66 | strncpy (curlocale, locale, 128); |
76 | strncpy (curlocale, locale, 128); |
67 | setlocale (LC_CTYPE, curlocale); |
77 | setlocale (LC_CTYPE, curlocale); |
68 | return true; |
78 | return true; |
69 | } |
79 | } |
70 | |
80 | |
71 | bool |
81 | void |
72 | rxvt_push_locale (const char *locale) |
82 | rxvt_push_locale (const char *locale) |
73 | { |
83 | { |
74 | strcpy (savelocale, curlocale); |
84 | strcpy (savelocale, curlocale); |
75 | rxvt_set_locale (locale); |
85 | rxvt_set_locale (locale); |
76 | } |
86 | } |
… | |
… | |
274 | if (parent[0]) |
284 | if (parent[0]) |
275 | XDestroyWindow (disp, parent[0]); |
285 | XDestroyWindow (disp, parent[0]); |
276 | } |
286 | } |
277 | |
287 | |
278 | // TODO: free pixcolours, colours should become part of rxvt_display |
288 | // TODO: free pixcolours, colours should become part of rxvt_display |
279 | |
|
|
280 | delete pix_colors_focused; |
289 | delete pix_colors_focused; |
281 | #if OFF_FOCUS_FADING |
290 | #if OFF_FOCUS_FADING |
282 | delete pix_colors_unfocused; |
291 | delete pix_colors_unfocused; |
283 | #endif |
|
|
284 | #if USE_XGETDEFAULT |
|
|
285 | XrmDestroyDatabase (xrmdatabase); |
|
|
286 | #endif |
292 | #endif |
287 | |
293 | |
288 | displays.put (display); |
294 | displays.put (display); |
289 | |
295 | |
290 | scr_release (); |
296 | scr_release (); |
… | |
… | |
472 | /*----------------------------------------------------------------------*/ |
478 | /*----------------------------------------------------------------------*/ |
473 | bool |
479 | bool |
474 | rxvt_term::init (int argc, const char *const *argv) |
480 | rxvt_term::init (int argc, const char *const *argv) |
475 | { |
481 | { |
476 | SET_R (this); |
482 | SET_R (this); |
|
|
483 | TEMP_ENV; // few things in X do not call setlocale :( |
477 | |
484 | |
478 | set_locale (""); |
485 | set_locale (""); |
479 | |
486 | |
480 | if (!init_vars ()) |
487 | if (!init_vars ()) |
481 | return false; |
488 | return false; |
… | |
… | |
502 | |
509 | |
503 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
510 | if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) |
504 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
511 | || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) |
505 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
512 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
506 | { |
513 | { |
507 | bool tainted = false; |
|
|
508 | |
|
|
509 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
514 | #if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__) |
510 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
515 | // ignore some perl-related arguments if some bozo installed us set[ug]id |
511 | if (getuid () != saved_euid || getgid () != saved_egid) |
516 | if (rxvt_tainted ()) |
512 | { |
517 | { |
513 | tainted = true; |
|
|
514 | |
|
|
515 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
518 | if ((rs[Rs_perl_lib] && *rs[Rs_perl_lib]) |
516 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
519 | || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) |
517 | { |
520 | { |
518 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
521 | rxvt_warn ("running with elevated privileges: ignoring perl-lib and perl-eval.\n"); |
519 | rs[Rs_perl_lib] = 0; |
522 | rs[Rs_perl_lib] = 0; |
520 | rs[Rs_perl_eval] = "our $tainted = 1"; |
523 | rs[Rs_perl_eval] = 0; |
521 | } |
524 | } |
522 | } |
525 | } |
523 | #endif |
526 | #endif |
524 | rxvt_perl.init (tainted); |
527 | rxvt_perl.init (); |
525 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
528 | HOOK_INVOKE ((this, HOOK_INIT, DT_END)); |
526 | } |
529 | } |
527 | #endif |
530 | #endif |
528 | |
531 | |
529 | create_windows (argc, argv); |
532 | create_windows (argc, argv); |
530 | |
533 | |
531 | dDisp; |
534 | dDisp; |
532 | |
535 | |
533 | init_xlocale (); |
536 | init_xlocale (); |
534 | |
537 | |
535 | scr_reset (); /* initialize screen */ |
538 | scr_reset (); // initialize screen |
536 | |
539 | |
537 | #if 0 |
540 | #if 0 |
538 | XSynchronize (disp, True); |
541 | XSynchronize (disp, True); |
539 | #endif |
542 | #endif |
540 | |
543 | |
… | |
… | |
639 | |
642 | |
640 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
643 | old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); |
641 | // TODO: handle this with exceptions and tolerate the memory loss |
644 | // TODO: handle this with exceptions and tolerate the memory loss |
642 | XSetIOErrorHandler (rxvt_xioerror_handler); |
645 | XSetIOErrorHandler (rxvt_xioerror_handler); |
643 | |
646 | |
644 | #ifdef USE_XGETDEFAULT |
|
|
645 | XrmInitialize (); |
647 | XrmInitialize (); |
646 | #endif |
|
|
647 | } |
648 | } |
648 | |
649 | |
649 | /* ------------------------------------------------------------------------- * |
650 | /* ------------------------------------------------------------------------- * |
650 | * MEMORY ALLOCATION WRAPPERS * |
651 | * MEMORY ALLOCATION WRAPPERS * |
651 | * ------------------------------------------------------------------------- */ |
652 | * ------------------------------------------------------------------------- */ |
… | |
… | |
702 | case IGNORE: |
703 | case IGNORE: |
703 | /* |
704 | /* |
704 | * change effective uid/gid - not real uid/gid - so we can switch |
705 | * change effective uid/gid - not real uid/gid - so we can switch |
705 | * back to root later, as required |
706 | * back to root later, as required |
706 | */ |
707 | */ |
|
|
708 | setegid (getgid ()); |
707 | seteuid (getuid ()); |
709 | seteuid (getuid ()); |
708 | setegid (getgid ()); |
|
|
709 | break; |
710 | break; |
710 | case SAVE: |
711 | case SAVE: |
|
|
712 | saved_egid = getegid (); |
711 | saved_euid = geteuid (); |
713 | saved_euid = geteuid (); |
712 | saved_egid = getegid (); |
|
|
713 | break; |
714 | break; |
714 | case RESTORE: |
715 | case RESTORE: |
|
|
716 | setegid (saved_egid); |
715 | seteuid (saved_euid); |
717 | seteuid (saved_euid); |
716 | setegid (saved_egid); |
|
|
717 | break; |
718 | break; |
718 | } |
719 | } |
719 | # else |
720 | # else |
720 | switch (action) |
721 | switch (action) |
721 | { |
722 | { |
722 | case IGNORE: |
723 | case IGNORE: |
|
|
724 | setgid (getgid ()); |
723 | setuid (getuid ()); |
725 | setuid (getuid ()); |
724 | setgid (getgid ()); |
|
|
725 | /* FALLTHROUGH */ |
726 | /* FALLTHROUGH */ |
726 | case SAVE: |
727 | case SAVE: |
727 | /* FALLTHROUGH */ |
728 | /* FALLTHROUGH */ |
728 | case RESTORE: |
729 | case RESTORE: |
729 | break; |
730 | break; |
… | |
… | |
1445 | unsigned long fg, bg; |
1446 | unsigned long fg, bg; |
1446 | const char *p; |
1447 | const char *p; |
1447 | char **s; |
1448 | char **s; |
1448 | XIMStyles *xim_styles; |
1449 | XIMStyles *xim_styles; |
1449 | |
1450 | |
|
|
1451 | TEMP_ENV; |
|
|
1452 | |
1450 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1453 | if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) |
1451 | return false; |
1454 | return false; |
1452 | |
1455 | |
1453 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1456 | D_MAIN ((stderr, "rxvt_IM_get_IC ()")); |
1454 | input_method = display->get_xim (locale, modifiers); |
1457 | input_method = display->get_xim (locale, modifiers); |