[vlc-commits] codec: textst: null rereference (cid #1399643)

Francois Cartegnie git at videolan.org
Tue Jan 31 10:51:45 CET 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Jan 31 10:18:41 2017 +0100| [471565601dc126658d32a2ac4d92f4c9c6d3ecce] | committer: Francois Cartegnie

codec: textst: null rereference (cid #1399643)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=471565601dc126658d32a2ac4d92f4c9c6d3ecce
---

 modules/codec/textst.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/textst.c b/modules/codec/textst.c
index a297493..223a98e 100644
--- a/modules/codec/textst.c
+++ b/modules/codec/textst.c
@@ -134,7 +134,7 @@ static size_t textst_FillRegion(decoder_t *p_dec, const uint8_t *p_data, size_t
                                            (p_data[0] << 4) / STYLE_DEFAULT_FONT_SIZE;*/
                  break;
              case BD_TEXTST_DATA_FONT_COLOR:
-                 if(i_data > 1)
+                 if(i_data > 1 && (p_style || (p_style = text_style_Create( STYLE_NO_DEFAULTS ))))
                  {
                     p_style->i_font_color = p_dec->p_sys->palette[p_data[1]] & 0x00FFFFFF;
                     p_style->i_font_alpha = p_dec->p_sys->palette[p_data[1]] >> 24;



More information about the vlc-commits mailing list