diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-03-31 12:59:33 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-03-31 12:59:33 +0000 |
| commit | 4fe8cbff144c0052edd89bd9a77882e8c4682af4 (patch) | |
| tree | 7d7579f4b93161ba45a3551df785d00dd14837e3 | |
| parent | 96c4832db7d4cd7cacef5522caf2eeeb1bad8a23 (diff) | |
| download | pango-4fe8cbff144c0052edd89bd9a77882e8c4682af4.tar.gz | |
Bug 334802 – Using plain integer as NULL pointer
2006-03-31 Behdad Esfahbod <behdad@gnome.org>
Bug 334802 – Using plain integer as NULL pointer
* pango/mapping.c (pango_glyph_string_x_to_index): Fix type assigining
trailing instead of *trailing.
* pango/pango-layout.c (pango_layout_line_new): Use NULL instead of 0.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | pango/mapping.c | 2 | ||||
| -rw-r--r-- | pango/pango-layout.c | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2006-03-31 Behdad Esfahbod <behdad@gnome.org> + Bug 334802 – Using plain integer as NULL pointer + + * pango/mapping.c (pango_glyph_string_x_to_index): Fix type assigining + trailing instead of *trailing. + + * pango/pango-layout.c (pango_layout_line_new): Use NULL instead of 0. + +2006-03-31 Behdad Esfahbod <behdad@gnome.org> + Convert pango/opentype to the new project called HarfBuzz. * pango/opentype/*: Restructured. diff --git a/pango/mapping.c b/pango/mapping.c index a90a55d0..a85e5cb5 100644 --- a/pango/mapping.c +++ b/pango/mapping.c @@ -272,7 +272,7 @@ pango_glyph_string_x_to_index (PangoGlyphString *glyphs, if (index) *index = start_index; if (trailing) - trailing = 0; + *trailing = 0; } else { diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 2f54b3ed..6a99d242 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -4060,7 +4060,7 @@ pango_layout_line_new (PangoLayout *layout) private->ref_count = 1; private->line.layout = layout; - private->line.runs = 0; + private->line.runs = NULL; private->line.length = 0; /* Note that we leave start_index, resolved_dir, and is_paragraph_start |