From 22541425cfc78e0f58d55e85a168be7260877c73 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 17 Oct 2018 12:29:27 -0400 Subject: [PATCH] 2018-10-17 Fred Gleason * Fixed a bug in rivwebcapi's 'RD_ListCartCuts()' and 'RD_ListCartsCuts()' functions that threw a segfault if the WebAPI returned an error response. --- ChangeLog | 4 ++++ apis/rivwebcapi/rivwebcapi/rd_listcartcuts.c | 1 + apis/rivwebcapi/rivwebcapi/rd_listcartscuts.c | 1 + 3 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 1697f9ed..f6e5624f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17811,3 +17811,7 @@ * Disabled the 'More than half the audio will be faded...' warning in the 'Edit Audio' dialog in rdlibrary(1) if the 'No Fade on Segue Out' checkbox is ticked. +2018-10-17 Fred Gleason + * Fixed a bug in rivwebcapi's 'RD_ListCartCuts()' and + 'RD_ListCartsCuts()' functions that threw a segfault if the WebAPI + returned an error response. diff --git a/apis/rivwebcapi/rivwebcapi/rd_listcartcuts.c b/apis/rivwebcapi/rivwebcapi/rd_listcartcuts.c index dbe62ad9..208d6b0a 100644 --- a/apis/rivwebcapi/rivwebcapi/rd_listcartcuts.c +++ b/apis/rivwebcapi/rivwebcapi/rd_listcartcuts.c @@ -357,6 +357,7 @@ int RD_ListCartCuts(struct rd_cart *carts[], * Setup the CURL call */ memset(&xml_data,0,sizeof(xml_data)); + xml_data.cut_ptr=-1; parser=XML_ParserCreate(NULL); XML_SetUserData(parser,&xml_data); XML_SetElementHandler(parser,__ListCartCutsElementStart, diff --git a/apis/rivwebcapi/rivwebcapi/rd_listcartscuts.c b/apis/rivwebcapi/rivwebcapi/rd_listcartscuts.c index 89d886a7..ef5a4a01 100644 --- a/apis/rivwebcapi/rivwebcapi/rd_listcartscuts.c +++ b/apis/rivwebcapi/rivwebcapi/rd_listcartscuts.c @@ -362,6 +362,7 @@ int RD_ListCartsCuts(struct rd_cart *carts[], */ memset(&xml_data,0,sizeof(xml_data)); xml_data.cart_ptr=-1; + xml_data.cut_ptr=-1; parser=XML_ParserCreate(NULL); XML_SetUserData(parser,&xml_data); XML_SetElementHandler(parser,__ListCartsCutsElementStart,