diff options
| author | Arvind Samptur <arvind.samptur@wipro.com> | 2003-07-31 09:35:56 +0000 |
|---|---|---|
| committer | Arvind Samptur <arvind@src.gnome.org> | 2003-07-31 09:35:56 +0000 |
| commit | fb5f3f6bb0640e7d14f19bc9bab7044a57a78c5e (patch) | |
| tree | 2497ce62679809a51fbd30f0c48fb20ea2bbbfad | |
| parent | 5558451c1156ff97c0f12242022454ff56a74f6e (diff) | |
| download | metacity-fb5f3f6bb0640e7d14f19bc9bab7044a57a78c5e.tar.gz | |
Number of strings we are processing is one more than required.
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/xprops.c | 5 |
2 files changed, 12 insertions, 1 deletions
@@ -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> * src/window.c (update_move): Update window shaking loose so that diff --git a/src/xprops.c b/src/xprops.c index 9083054a..d8859ab0 100644 --- a/src/xprops.c +++ b/src/xprops.c @@ -451,7 +451,7 @@ utf8_list_from_results (GetPropertyResults *results, * property is nul-separated */ i = 0; - n_strings = 1; + n_strings = 0; while (i < (int) results->n_items) { if (results->prop[i] == '\0') @@ -459,6 +459,9 @@ utf8_list_from_results (GetPropertyResults *results, ++i; } + if (results->prop[results->n_items - 1] != '\0') + ++n_strings; + /* we're guaranteed that results->prop has a nul on the end * by XGetWindowProperty */ |