set userDataSize, schemeURI or value null cases, kind box as data

Author: Vltnrch

src/filters/isoffin_load.c

@@ -709,7 +709,7 @@ static ISOMChannel *isor_setup_channel(ISOMReader *read, u32 track, u32 streamty
 					else
 						snprintf(szName, 30, "udta_%s", gf_4cc_to_str(type));
 					szName[30]=0;
-					if (gf_utf8_is_legal(udta, udta_size)) {
+					if (gf_utf8_is_legal(udta, udta_size) && type != GF_ISOM_BOX_TYPE_KIND) {
 						if (!udta[udta_size-1]) {
 							gf_filter_pid_set_property_dyn(ch->pid, szName, &PROP_STRING_NO_COPY(udta));
 						} else {

src/isomedia/isom_read.c

@@ -2823,12 +2823,19 @@ GF_Err gf_isom_get_user_data(GF_ISOFile *movie, u32 trackNumber, u32 UserDataTyp
 			return GF_OK;
 		} else if (ptr->type == GF_ISOM_BOX_TYPE_KIND) {
 			GF_KindBox *kind = (GF_KindBox *)ptr;
-			u32 lenSchemeURI = (u32) strlen(kind->schemeURI) + 1;
-			u32 lenValue = (u32) strlen(kind->value) + 1;
-			*userData = (char *)gf_malloc(sizeof(char) * (lenSchemeURI+lenValue));
+			u32 len, lenSchemeURI;
+			len = lenSchemeURI = (kind->schemeURI ? strlen(kind->schemeURI) : 0) + 1;
+			len += (kind->value ? strlen(kind->value) + 1 : 0);
+			len += sizeof(kind->flags);
+			*userData = (char *)gf_malloc(sizeof(char) * len);
 			if (!*userData) return GF_OUT_OF_MEM;
-			memcpy(*userData, kind->schemeURI, sizeof(char)*lenSchemeURI);
-			memcpy(*userData + lenSchemeURI, kind->value, sizeof(char)*lenValue);
+			memcpy(*userData, &(kind->flags), sizeof(kind->flags));
+			if (kind->schemeURI)
+				strcpy(*userData + sizeof(kind->flags), kind->schemeURI);
+			else
+				*(*userData + sizeof(kind->flags)) = 0;
+			if (kind->value) strcpy(*userData + sizeof(kind->flags) + lenSchemeURI, kind->value);
+			*userDataSize = len;
 			return GF_OK;
 		} else {
 			char *str = NULL;