Merge remote-tracking branch 'upstream/master' into file_rotate

pashamesh · Aug 10, 2015 · f524adc · f524adc
2 parents 50a1836 + 00ed5e2
commit f524adc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/libdvbtee/decode.cpp b/libdvbtee/decode.cpp
@@ -794,10 +794,12 @@ static bool __take_sdt(dvbpsi_sdt_t* p_sdt, decoded_sdt_t* decoded_sdt, desc* de
 		descriptors->decode(p_service->p_first_descriptor);
 		strncpy((char*)cur_service.provider_name,
 			(const char*)descriptors->provider_name,
-			sizeof(cur_service.provider_name));
+			sizeof(cur_service.provider_name)-1);
+		cur_service.provider_name[sizeof(cur_service.provider_name)-1] = '\0';
 		strncpy((char*)cur_service.service_name,
 			(const char*)descriptors->service_name,
-			sizeof(cur_service.service_name));
+			sizeof(cur_service.service_name)-1);
+		cur_service.service_name[sizeof(cur_service.service_name)-1] = '\0';
 
 		dprintf("%05d | %s %s | %s - %s",
 			cur_service.service_id,
@@ -1279,7 +1281,10 @@ bool decode::get_epg_event_dvb(uint16_t service_id, time_t showtime, decoded_eve
 
 	unsigned int eit_num = 0;
 
-	if (get_decoded_eit()) while ((eit_num < NUM_EIT) && (get_decoded_eit()[eit_num].count(service_id))) {
+	const map_decoded_eit *decoded_eit = get_decoded_eit();
+	// FIXME:  CHANGE TO CONST_ITERATOR -- THIS IS DANGEROUS!!
+
+	if (decoded_eit) while ((eit_num < NUM_EIT) && (decoded_eit[eit_num].count(service_id))) {
 #if 0
 		fprintf(stdout, "%s-%d: id:%d - %d: %s\n", __func__,
 			eit_num, iter_sdt->second.service_id,
@@ -1288,9 +1293,9 @@ bool decode::get_epg_event_dvb(uint16_t service_id, time_t showtime, decoded_eve
 #endif
 
 		map_decoded_eit_events::const_iterator iter_eit;
-		if (get_decoded_eit())
-		for (iter_eit = ((map_decoded_eit*)get_decoded_eit())[eit_num][iter_sdt->second.service_id].events.begin();
-		     iter_eit != ((map_decoded_eit*)get_decoded_eit())[eit_num][iter_sdt->second.service_id].events.end();
+		//if (decoded_eit)
+		for (iter_eit = ((map_decoded_eit*)decoded_eit)[eit_num][iter_sdt->second.service_id].events.begin();
+		     iter_eit != ((map_decoded_eit*)decoded_eit)[eit_num][iter_sdt->second.service_id].events.end();
 		     ++iter_eit) {
 
 			time_t start = datetime_utc(iter_eit->second.start_time /*+ (60 * tz_offset)*/);
@@ -1401,9 +1406,11 @@ void decode::dump_eit_x_dvb(decode_report *reporter, uint8_t eit_x, uint16_t ser
 #endif
 
 		map_decoded_eit_events::const_iterator iter_eit;
-		if (get_decoded_eit())
-		for (iter_eit = ((map_decoded_eit*)get_decoded_eit())[eit_x][iter_sdt->second.service_id].events.begin();
-		     iter_eit != ((map_decoded_eit*)get_decoded_eit())[eit_x][iter_sdt->second.service_id].events.end();
+		const map_decoded_eit *decoded_eit = get_decoded_eit();
+		// FIXME:  CHANGE TO CONST_ITERATOR -- THIS IS DANGEROUS!!
+		if (decoded_eit)
+		for (iter_eit = ((map_decoded_eit*)decoded_eit)[eit_x][iter_sdt->second.service_id].events.begin();
+		     iter_eit != ((map_decoded_eit*)decoded_eit)[eit_x][iter_sdt->second.service_id].events.end();
 		     ++iter_eit) {
 #if 0
 			time_t start = datetime_utc(iter_eit->second.start_time /*+ (60 * tz_offset)*/);
@@ -1453,7 +1460,9 @@ void decode::dump_epg_dvb(decode_report *reporter, uint16_t service_id)
 {
 	unsigned int eit_num = 0;
 
-	if (get_decoded_eit()) while ((eit_num < NUM_EIT) && (get_decoded_eit()[eit_num].count(service_id))) {
+	const map_decoded_eit *decoded_eit = get_decoded_eit();
+
+	if (decoded_eit) while ((eit_num < NUM_EIT) && (decoded_eit[eit_num].count(service_id))) {
 		dump_eit_x_dvb(reporter, eit_num, service_id);
 		eit_num++;
 	}

diff --git a/libdvbtee/decode.h b/libdvbtee/decode.h
@@ -76,7 +76,7 @@ typedef struct ts_elementary_stream_s
 	// from ISO639 language descriptor 0A:
 	unsigned char iso_639_code[4];
 
-	ts_elementary_stream_s() { memset(iso_639_code, 0, sizeof(iso_639_code)); }
+	ts_elementary_stream_s() : type(0xff), pid(0xffff) { memset(iso_639_code, 0, sizeof(iso_639_code)); }
 } ts_elementary_stream_t; // FIXME: rename this later
 
 typedef std::map<uint16_t, ts_elementary_stream_t> map_ts_elementary_streams; /* arbitrary idx(pid), ts_elementary_stream_t */

diff --git a/libdvbtee_server/serve.cpp b/libdvbtee_server/serve.cpp
@@ -1252,7 +1252,10 @@ bool serve_client::__command(char* cmdline)
 					cli_print("ERROR: open_file(%s) failed.\n", arg);
 					return false;
 				}
-				feeder->start();
+				if (!feeder->start()) {
+					cli_print("ERROR: start() failed.\n");
+					return false;
+				}
 			} else
 			if (strstr(cmd, "opensock")) {
 				feeder->start_socket(arg);