Unified · Split
| @@ -849,14 +849,18 @@ static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int · 848 unmodified lines | ||
| 849 | 849 | if (is_meta) { |
| 850 | 850 | if ( pkt->side_data[i].type == AV_PKT_DATA_METADATA_UPDATE |
| 851 | 851 | || pkt->side_data[i].type == AV_PKT_DATA_STRINGS_METADATA) { |
| 852 | − if (!size || data[size-1]) | |
| 853 | − return AVERROR(EINVAL); | |
| 852 | + if (!size || data[size-1]) { | |
| 853 | + ret = AVERROR(EINVAL); | |
| 854 | + goto fail; | |
| 855 | + } | |
| 854 | 856 | while (data < data_end) { |
| 855 | 857 | const uint8_t *key = data; |
| 856 | 858 | const uint8_t *val = data + strlen(key) + 1; |
| 857 | 859 | |
| 858 | − if(val >= data_end) | |
| 859 | − return AVERROR(EINVAL); | |
| 860 | + if(val >= data_end) { | |
| 861 | + ret = AVERROR(EINVAL); | |
| 862 | + goto fail; | |
| 863 | + } | |
| 860 | 864 | put_str(dyn_bc, key); |
| 861 | 865 | put_s(dyn_bc, -1); |
| 862 | 866 | put_str(dyn_bc, val); |
| @@ -937,12 +941,13 @@ static int write_sm_data(AVFormatContext *s, AVIOContext *bc, AVPacket *pkt, int · 74 unmodified lines | ||
| 937 | 941 | } |
| 938 | 942 | } |
| 939 | 943 | |
| 944 | +fail: | |
| 940 | 945 | ff_put_v(bc, sm_data_count); |
| 941 | 946 | dyn_size = avio_close_dyn_buf(dyn_bc, &dyn_buf); |
| 942 | 947 | avio_write(bc, dyn_buf, dyn_size); |
| 943 | 948 | av_freep(&dyn_buf); |
| 944 | 949 | |
| 945 | − return 0; | |
| 950 | + return ret; | |
| 946 | 951 | } |
| 947 | 952 | |
| 948 | 953 | static int nut_write_packet(AVFormatContext *s, AVPacket *pkt) |