commit d060947ce9c8aafa194da5625e4ab9b58530820d
author Josh Coalson <jcoalson@users.sourceforce.net> Fri Jan 10 05:37:13 2003 +0000
committer Josh Coalson <jcoalson@users.sourceforce.net> Fri Jan 10 05:37:13 2003 +0000
tree ed2ba4e6066f609a4356090da53f31fb1eaaef64
parent 0eea34aad09373896adca6c2e3db575e0f0a8c17

big fix to allow codec and metadata interface to handle unknown metadata block types correctly

src/libFLAC/metadata_object.c

diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c
index c6de62b..8bf1dd5 100644
--- a/src/libFLAC/metadata_object.c
+++ b/src/libFLAC/metadata_object.c
@@ -332,11 +332,22 @@
 				object->length = FLAC__STREAM_METADATA_STREAMINFO_LENGTH;
 				break;
 			case FLAC__METADATA_TYPE_PADDING:
+				/* calloc() took care of this for us:
+				object->length = 0;
+				*/
 				break;
 			case FLAC__METADATA_TYPE_APPLICATION:
 				object->length = FLAC__STREAM_METADATA_APPLICATION_ID_LEN / 8;
+				/* calloc() took care of this for us:
+				object->data.application.data = 0;
+				*/
 				break;
 			case FLAC__METADATA_TYPE_SEEKTABLE:
+				/* calloc() took care of this for us:
+				object->length = 0;
+				object->data.seek_table.num_points = 0;
+				object->data.seek_table.points = 0;
+				*/
 				break;
 			case FLAC__METADATA_TYPE_VORBIS_COMMENT:
 				{
@@ -352,10 +363,11 @@
 				cuesheet_calculate_length_(object);
 				break;
 			default:
-				/* double protection: */
-				FLAC__ASSERT(0);
-				free(object);
-				return 0;
+				/* calloc() took care of this for us:
+				object->length = 0;
+				object->data.unknown.data = 0;
+				*/
+				break;
 		}
 	}
 
@@ -430,10 +442,11 @@
 				}
 				break;
 			default:
-				/* double protection: */
-				FLAC__ASSERT(0);
-				free(to);
-				return 0;
+				if(!copy_bytes_(&to->data.unknown.data, object->data.unknown.data, object->length)) {
+					FLAC__metadata_object_delete(to);
+					return 0;
+				}
+				break;
 		}
 	}
 
@@ -477,7 +490,11 @@
 			}
 			break;
 		default:
-			FLAC__ASSERT(0);
+			if(0 != object->data.unknown.data) {
+				free(object->data.unknown.data);
+				object->data.unknown.data = 0;
+			}
+			break;
 	}
 }
 
@@ -626,6 +643,17 @@
 	return true;
 }
 
+static FLAC__bool compare_block_data_unknown_(const FLAC__StreamMetadata_Unknown *block1, const FLAC__StreamMetadata_Unknown *block2, unsigned block_length)
+{
+	FLAC__ASSERT(0 != block1);
+	FLAC__ASSERT(0 != block2);
+
+	if(0 != block1->data && 0 != block2->data)
+		return 0 == memcmp(block1->data, block2->data, block_length);
+	else
+		return block1->data == block2->data;
+}
+
 FLAC_API FLAC__bool FLAC__metadata_object_is_equal(const FLAC__StreamMetadata *block1, const FLAC__StreamMetadata *block2)
 {
 	FLAC__ASSERT(0 != block1);
@@ -654,8 +682,7 @@
 		case FLAC__METADATA_TYPE_CUESHEET:
 			return compare_block_data_cuesheet_(&block1->data.cue_sheet, &block2->data.cue_sheet);
 		default:
-			FLAC__ASSERT(0);
-			return false;
+			return compare_block_data_unknown_(&block1->data.unknown, &block2->data.unknown, block1->length);
 	}
 }