ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtperl.xs
(Generate patch)

Comparing rxvt-unicode/src/rxvtperl.xs (file contents):
Revision 1.40 by root, Sun Jan 8 00:07:18 2006 UTC vs.
Revision 1.42 by root, Sun Jan 8 08:43:11 2006 UTC

… …
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "rxvtperl.h" 37#include "rxvtperl.h"
38 38
39#include "perlxsi.c" 39#include "perlxsi.c"
40 40
41#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
42# define GRAB_CURSOR THIS->leftptr_cursor
43#else
44# define GRAB_CURSOR None
45#endif
46
41#undef LINENO 47#undef LINENO
42#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows) 48#define LINENO(n) MOD (THIS->term_start + int(n), THIS->total_rows)
43#undef ROW 49#undef ROW
44#define ROW(n) THIS->row_buf [LINENO (n)] 50#define ROW(n) THIS->row_buf [LINENO (n)]
45 51
46///////////////////////////////////////////////////////////////////////////// 52/////////////////////////////////////////////////////////////////////////////
53
54static SV *
55taint (SV *sv)
56{
57 SvTAINT (sv);
58 return sv;
59}
60
61static SV *
62taint_if (SV *sv, SV *src)
63{
64 if (SvTAINTED (src))
65 SvTAINT (sv);
66
67 return sv;
68}
47 69
48static wchar_t * 70static wchar_t *
49sv2wcs (SV *sv) 71sv2wcs (SV *sv)
50{ 72{
51 STRLEN len; 73 STRLEN len;
… …
384 perl_free (perl); 406 perl_free (perl);
385 } 407 }
386} 408}
387 409
388void 410void
389rxvt_perl_interp::init () 411rxvt_perl_interp::init (bool tainted)
390{ 412{
391 if (!perl) 413 if (!perl)
392 { 414 {
393 char *argv[] = { 415 char *argv[] = {
394 "", 416 "",
395 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1", 417 "-edo '" LIBDIR "/urxvt.pm' or ($@ and die $@) or exit 1",
418 "-T",
396 }; 419 };
397 420
398 perl = perl_alloc (); 421 perl = perl_alloc ();
399 perl_construct (perl); 422 perl_construct (perl);
400 423
401 if (perl_parse (perl, xs_init, 2, argv, (char **)NULL) 424 if (perl_parse (perl, xs_init, 2 + !!tainted, argv, (char **)NULL)
402 || perl_run (perl)) 425 || perl_run (perl))
403 { 426 {
404 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n"); 427 rxvt_warn ("unable to initialize perl-interpreter, continuing without.\n");
405 428
406 perl_destruct (perl); 429 perl_destruct (perl);
… …
467 case DT_LONG: 490 case DT_LONG:
468 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long)))); 491 XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
469 break; 492 break;
470 493
471 case DT_STR: 494 case DT_STR:
472 XPUSHs (sv_2mortal (newSVpv (va_arg (ap, char *), 0))); 495 XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
473 break; 496 break;
474 497
475 case DT_STR_LEN: 498 case DT_STR_LEN:
476 { 499 {
477 char *str = va_arg (ap, char *); 500 char *str = va_arg (ap, char *);
478 int len = va_arg (ap, int); 501 int len = va_arg (ap, int);
479 502
480 XPUSHs (sv_2mortal (newSVpvn (str, len))); 503 XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
481 } 504 }
482 break; 505 break;
483 506
484 case DT_WCS_LEN: 507 case DT_WCS_LEN:
485 { 508 {
486 wchar_t *wstr = va_arg (ap, wchar_t *); 509 wchar_t *wstr = va_arg (ap, wchar_t *);
487 int wlen = va_arg (ap, int); 510 int wlen = va_arg (ap, int);
488 511
489 XPUSHs (sv_2mortal (wcs2sv (wstr, wlen))); 512 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
490 } 513 }
491 break; 514 break;
492 515
493 case DT_XEVENT: 516 case DT_XEVENT:
494 { 517 {
… …
735void 758void
736rxvt_term::grab_button (int button, U32 modifiers) 759rxvt_term::grab_button (int button, U32 modifiers)
737 CODE: 760 CODE:
738 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1, 761 XGrabButton (THIS->display->display, button, modifiers, THIS->vt, 1,
739 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 762 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
740 GrabModeSync, GrabModeSync, None, None); 763 GrabModeSync, GrabModeSync, None, GRAB_CURSOR);
741 764
742bool 765bool
743rxvt_term::grab (U32 eventtime, int sync = 0) 766rxvt_term::grab (U32 eventtime, int sync = 0)
744 CODE: 767 CODE:
745{ 768{
… …
747 770
748 THIS->perl.grabtime = 0; 771 THIS->perl.grabtime = 0;
749 772
750 if (!XGrabPointer (THIS->display->display, THIS->vt, 0, 773 if (!XGrabPointer (THIS->display->display, THIS->vt, 0,
751 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask, 774 ButtonPressMask | ButtonReleaseMask | EnterWindowMask | LeaveWindowMask | PointerMotionMask,
752 mode, mode, None, None, eventtime)) 775 mode, mode, None, GRAB_CURSOR, eventtime))
753 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime)) 776 if (!XGrabKeyboard (THIS->display->display, THIS->vt, 0, mode, mode, eventtime))
754 THIS->perl.grabtime = eventtime; 777 THIS->perl.grabtime = eventtime;
755 else 778 else
756 XUngrabPointer (THIS->display->display, eventtime); 779 XUngrabPointer (THIS->display->display, eventtime);
757 780
… …
808 char *mbstr = rxvt_wcstombs (wstr); 831 char *mbstr = rxvt_wcstombs (wstr);
809 rxvt_pop_locale (); 832 rxvt_pop_locale ();
810 833
811 free (wstr); 834 free (wstr);
812 835
813 RETVAL = newSVpv (mbstr, 0); 836 RETVAL = taint_if (newSVpv (mbstr, 0), str);
814 free (mbstr); 837 free (mbstr);
815} 838}
816 OUTPUT: 839 OUTPUT:
817 RETVAL 840 RETVAL
818 841
… …
825 848
826 rxvt_push_locale (THIS->locale); 849 rxvt_push_locale (THIS->locale);
827 wchar_t *wstr = rxvt_mbstowcs (data, len); 850 wchar_t *wstr = rxvt_mbstowcs (data, len);
828 rxvt_pop_locale (); 851 rxvt_pop_locale ();
829 852
830 RETVAL = wcs2sv (wstr); 853 RETVAL = taint_if (wcs2sv (wstr), octets);
831 free (wstr); 854 free (wstr);
832} 855}
833 OUTPUT: 856 OUTPUT:
834 RETVAL 857 RETVAL
835 858
… …
942 wchar_t *wstr = new wchar_t [THIS->ncol]; 965 wchar_t *wstr = new wchar_t [THIS->ncol];
943 966
944 for (int col = 0; col < THIS->ncol; col++) 967 for (int col = 0; col < THIS->ncol; col++)
945 wstr [col] = l.t [col]; 968 wstr [col] = l.t [col];
946 969
947 XPUSHs (sv_2mortal (wcs2sv (wstr, THIS->ncol))); 970 XPUSHs (taint (sv_2mortal (wcs2sv (wstr, THIS->ncol))));
948 971
949 delete [] wstr; 972 delete [] wstr;
950 } 973 }
951 974
952 if (new_text) 975 if (new_text)
… …
1073 else 1096 else
1074 *r++ = *s; 1097 *r++ = *s;
1075 1098
1076 rxvt_pop_locale (); 1099 rxvt_pop_locale ();
1077 1100
1078 RETVAL = wcs2sv (rstr, r - rstr); 1101 RETVAL = taint_if (wcs2sv (rstr, r - rstr), string);
1079 1102
1080 delete [] rstr; 1103 delete [] rstr;
1081} 1104}
1082 OUTPUT: 1105 OUTPUT:
1083 RETVAL 1106 RETVAL
… …
1109 else if (IS_COMPOSE (*s)) 1132 else if (IS_COMPOSE (*s))
1110 r += rxvt_composite.expand (*s, r); 1133 r += rxvt_composite.expand (*s, r);
1111 else 1134 else
1112 *r++ = *s; 1135 *r++ = *s;
1113 1136
1114 RETVAL = wcs2sv (rstr, r - rstr); 1137 RETVAL = taint_if (wcs2sv (rstr, r - rstr), text);
1115 1138
1116 delete [] rstr; 1139 delete [] rstr;
1117} 1140}
1118 OUTPUT: 1141 OUTPUT:
1119 RETVAL 1142 RETVAL
… …
1141 1164
1142 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES)) 1165 if (!IN_RANGE_EXC (index, 0, NUM_RESOURCES))
1143 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value); 1166 croak ("requested out-of-bound resource %s+%d,", name, index - rs->value);
1144 1167
1145 if (GIMME_V != G_VOID) 1168 if (GIMME_V != G_VOID)
1146 XPUSHs (THIS->rs [index] ? sv_2mortal (newSVpv (THIS->rs [index], 0)) : &PL_sv_undef); 1169 XPUSHs (THIS->rs [index] ? sv_2mortal (taint (newSVpv (THIS->rs [index], 0))) : &PL_sv_undef);
1147 1170
1148 if (newval) 1171 if (newval)
1149 { 1172 {
1150 if (SvOK (newval)) 1173 if (SvOK (newval))
1151 { 1174 {
… …
1232void 1255void
1233rxvt_term::selection (SV *newtext = 0) 1256rxvt_term::selection (SV *newtext = 0)
1234 PPCODE: 1257 PPCODE:
1235{ 1258{
1236 if (GIMME_V != G_VOID) 1259 if (GIMME_V != G_VOID)
1237 XPUSHs (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))); 1260 XPUSHs (taint (sv_2mortal (wcs2sv (THIS->selection.text, THIS->selection.len))));
1238 1261
1239 if (newtext) 1262 if (newtext)
1240 { 1263 {
1241 free (THIS->selection.text); 1264 free (THIS->selection.text);
1242 1265

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines