isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Number of strings we are processing is one more than required.

Browse Source 
2003-07-29  Arvind Samptur  <arvind.samptur@wipro.com>

        * src/xprops.c (utf8_list_from_results): Number of
        strings we are processing is one more than required.

        Also get the string count right even without a null byte at the end.
        Pointed out by Havoc.
This commit is contained in:
Arvind Samptur 2003-07-31 09:35:56 +00:00 committed by Arvind Samptur
parent 5558451c11
commit fb5f3f6bb0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2003-07-29 Arvind Samptur <arvind.samptur@wipro.com>
* src/xprops.c (utf8_list_from_results): Number of
strings we are processing is one more than required.
Also get the string count right even without a null byte at the end.
Pointed out by Havoc.
2003-07-27 Rob Adams <robadams@ucla.edu> 2003-07-27 Rob Adams <robadams@ucla.edu>
* src/window.c (update_move): Update window shaking loose so that * src/window.c (update_move): Update window shaking loose so that

5
src/xprops.c
View File

@ -451,7 +451,7 @@ utf8_list_from_results (GetPropertyResults *results,
* property is nul-separated * property is nul-separated
*/ */
i = 0; i = 0;
n_strings = 1; n_strings = 0;
while (i < (int) results->n_items) while (i < (int) results->n_items)
{ {
if (results->prop[i] == '\0') if (results->prop[i] == '\0')
@ -459,6 +459,9 @@ utf8_list_from_results (GetPropertyResults *results,
++i; ++i;
} }
if (results->prop[results->n_items - 1] != '\0')
++n_strings;
/* we're guaranteed that results->prop has a nul on the end /* we're guaranteed that results->prop has a nul on the end
* by XGetWindowProperty * by XGetWindowProperty
*/ */