open-src/lib/libX11/solaris-kbd.patch
changeset 1301 371a43cad701
parent 1294 a1e1d31e0aa4
child 1408 17c15e2662ba
equal deleted inserted replaced
1300:415644304d9f 1301:371a43cad701
   570 +	XChangeKeyboardControl (dpy, KBLed | KBLedMode, &led_control);
   570 +	XChangeKeyboardControl (dpy, KBLed | KBLedMode, &led_control);
   571 +    }
   571 +    }
   572 +}
   572 +}
   573 +#endif /* SUNSOFT_KBD */
   573 +#endif /* SUNSOFT_KBD */
   574 diff --git a/src/imConv.c b/src/imConv.c
   574 diff --git a/src/imConv.c b/src/imConv.c
   575 index e212049..35e58a3 100644
   575 index c3c1974..40f5328 100644
   576 --- a/src/imConv.c
   576 --- a/src/imConv.c
   577 +++ b/src/imConv.c
   577 +++ b/src/imConv.c
   578 @@ -214,7 +214,9 @@ _XimLookupMBText(
   578 @@ -213,7 +213,9 @@ _XimLookupMBText(
   579  			    args, 1 ) != 0) {
   579  			    args, 1 ) != 0) {
   580  		count = 0;
   580  		count = 0;
   581  	    } else {
   581  	    } else {
   582 -                count = nbytes - to_len;
   582 -                count = nbytes - to_len;
   583 +                if(count != 0){
   583 +                if(count != 0){
   584 +                    count = nbytes - to_len;
   584 +                    count = nbytes - to_len;
   585 +                }
   585 +                }
   586  	    }
   586  	    }
   587  	}
   587  	}
   588      }
   588      }
   589 @@ -284,7 +286,9 @@ _XimLookupWCText(
   589 @@ -283,7 +285,9 @@ _XimLookupWCText(
   590  			    args, 1 ) != 0) {
   590  			    args, 1 ) != 0) {
   591  		count = 0;
   591  		count = 0;
   592  	    } else {
   592  	    } else {
   593 -                count = nbytes - to_len;
   593 -                count = nbytes - to_len;
   594 +                if(count != 0){
   594 +                if(count != 0){
   595 +                    count = nbytes - to_len;
   595 +                    count = nbytes - to_len;
   596 +                }
   596 +                }
   597  	    }
   597  	    }
   598  	}
   598  	}
   599      } else
   599      } else
   600 @@ -345,7 +349,9 @@ _XimLookupUTF8Text(
   600 @@ -344,7 +348,9 @@ _XimLookupUTF8Text(
   601                          NULL, 0) != 0) {
   601                          NULL, 0) != 0) {
   602  	    count = 0;
   602  	    count = 0;
   603  	} else {
   603  	} else {
   604 -            count = nbytes - to_len;
   604 -            count = nbytes - to_len;
   605 +            if(count != 0){
   605 +            if(count != 0){