diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-01-29 15:53:42 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-01-29 15:53:42 +0000 |
| commit | 5d6e81b22b0bb0033196c1a101e01f3c50002390 (patch) | |
| tree | a47fbd6f99a27efdd11c3d34cd84182e4ea11885 | |
| parent | 2fe33cf8a280ad9bcccc6bc65e411d64609175af (diff) | |
| download | pango-5d6e81b22b0bb0033196c1a101e01f3c50002390.tar.gz | |
Fix an off-by-one error when checking if are off the end of the coverage
Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com>
* pango/pango-coverage.c (pango_coverage_set/get): Fix
an off-by-one error when checking if are off the end
of the coverage array. (#102284, Morten Welinder.)
* pango/pango-coverage.c (pango_coverage_get/set): Add
g_return_if_fail for index >= 0.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | pango/pango-coverage.c | 6 |
6 files changed, 49 insertions, 2 deletions
@@ -1,3 +1,12 @@ +Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-coverage.c (pango_coverage_set/get): Fix + an off-by-one error when checking if are off the end + of the coverage array. (#102284, Morten Welinder.) + + * pango/pango-coverage.c (pango_coverage_get/set): Add + g_return_if_fail for index >= 0. + 2003-01-29 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b6d71a58..9954a6ae 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-coverage.c (pango_coverage_set/get): Fix + an off-by-one error when checking if are off the end + of the coverage array. (#102284, Morten Welinder.) + + * pango/pango-coverage.c (pango_coverage_get/set): Add + g_return_if_fail for index >= 0. + 2003-01-29 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b6d71a58..9954a6ae 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-coverage.c (pango_coverage_set/get): Fix + an off-by-one error when checking if are off the end + of the coverage array. (#102284, Morten Welinder.) + + * pango/pango-coverage.c (pango_coverage_get/set): Add + g_return_if_fail for index >= 0. + 2003-01-29 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b6d71a58..9954a6ae 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-coverage.c (pango_coverage_set/get): Fix + an off-by-one error when checking if are off the end + of the coverage array. (#102284, Morten Welinder.) + + * pango/pango-coverage.c (pango_coverage_get/set): Add + g_return_if_fail for index >= 0. + 2003-01-29 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b6d71a58..9954a6ae 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Tue Jan 28 18:20:45 2003 Owen Taylor <otaylor@redhat.com> + + * pango/pango-coverage.c (pango_coverage_set/get): Fix + an off-by-one error when checking if are off the end + of the coverage array. (#102284, Morten Welinder.) + + * pango/pango-coverage.c (pango_coverage_get/set): Add + g_return_if_fail for index >= 0. + 2003-01-29 Tor Lillqvist <tml@iki.fi> * pango/pangowin32.c (pango_win32_font_calc_coverage): Break out diff --git a/pango/pango-coverage.c b/pango/pango-coverage.c index 52a7c958..65c87e06 100644 --- a/pango/pango-coverage.c +++ b/pango/pango-coverage.c @@ -169,10 +169,11 @@ pango_coverage_get (PangoCoverage *coverage, int block_index; g_return_val_if_fail (coverage != NULL, PANGO_COVERAGE_NONE); + g_return_val_if_fail (index >= 0, PANGO_COVERAGE_NONE); block_index = index / 256; - if (block_index > coverage->n_blocks) + if (block_index >= coverage->n_blocks) return PANGO_COVERAGE_NONE; else { @@ -206,11 +207,12 @@ pango_coverage_set (PangoCoverage *coverage, guchar *data; g_return_if_fail (coverage != NULL); + g_return_if_fail (index >= 0); g_return_if_fail (level >= 0 || level <= 3); block_index = index / 256; - if (block_index > coverage->n_blocks) + if (block_index >= coverage->n_blocks) { int old_n_blocks = coverage->n_blocks; |