fixed a segfault, fixed some double-reader requests

module-cccam.c

@@ -1365,8 +1365,7 @@ int32_t cc_send_ecm(struct s_client *cl, ECM_REQUEST *er, uchar *buf) {
 
 				cur_er->rc = E_NOTFOUND;
 				cur_er->rcEx = E2_CCCAM_NOCARD;
-				write_ecm_answer(rdr, cur_er, E_NOTFOUND, E2_CCCAM_NOCARD, NULL,
-						NULL);
+				write_ecm_answer(rdr, cur_er, E_NOTFOUND, E2_CCCAM_NOCARD, NULL, NULL);
 				//cur_er->rc = 1;
 				//cur_er->rcEx = 0;
 				//cs_sleepms(300);
@@ -2880,7 +2879,7 @@ int32_t cc_recv(struct s_client *cl, uchar *buf, int32_t l) {
 
 	if (n <= 0) {
 		struct cc_data *cc = cl->cc;
-		if (cc->nok_message)
+		if (cc && cc->nok_message)
 			cs_log("%s connection closed by %s. Reason: %s", getprefix(), remote_txt(), cc->nok_message);
 		else
 			cs_log("%s connection closed by %s.", getprefix(), remote_txt());

module-datastruct-llist.c

@@ -80,6 +80,7 @@ static void *ll_iter_next_nolock(LL_ITER *it)
 			if (!ptr) {
 				//it->cur = prvnxt;
 				ll_iter_reset(it); // restart iteration
+				it->cur = it->l->initial;
 			}
 		}
 		it->ll_version = it->l->version;

oscam.c

@@ -2079,7 +2079,7 @@ int32_t write_ecm_answer(struct s_reader * reader, ECM_REQUEST *er, int8_t rc, u
 	if (er->parent) {
 		// parent is only set on reader->client->ecmtask[], but we want client->ecmtask[]
 		er->rc = rc;
-		//er->idx = 0;
+		er->idx = 0;
 		er = er->parent;
 	}
 
@@ -3634,8 +3634,11 @@ void * work_thread(void *ptr) {
 				if (reader)
 					data->action = ACTION_READER_REMOTE;
 				else {
-					if (cl->is_udp)
+					if (cl->is_udp) {
 						data->action = ACTION_CLIENT_UDP;
+						data->ptr = mbuf;
+						data->len = bufsize;
+					}
 					else
 						data->action = ACTION_CLIENT_TCP;
 					if (pfd[0].revents & (POLLHUP | POLLNVAL))
@@ -3744,11 +3747,13 @@ void * work_thread(void *ptr) {
 			case ACTION_CLIENT_UDP:
 				n = ph[cl->ctyp].recv(cl, data->ptr, data->len);
 				if (n<0) {
-					free(data->ptr);
+					if (data->ptr != mbuf)
+						free(data->ptr);
 					break;
 				}
 				ph[cl->ctyp].s_handler(cl, data->ptr, n);
-				free(data->ptr); // allocated in accept_connection()
+				if (data->ptr != mbuf)
+					free(data->ptr); // allocated in accept_connection()
 				break;
 			case ACTION_CLIENT_TCP:
 				s = check_fd_for_data(cl->pfd);