virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/img2enc: allocate temp and target filename dynamically

Browse Source 
To avoid truncation of filename with additional .tmp extension.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2025-08-01 22:12:47 +02:00
parent 9b0cc80dc2
commit 7410e29f5d
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libavformat/img2enc.c
View File

@@ -28,6 +28,7 @@
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/dict.h" #include "libavutil/dict.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/time_internal.h" #include "libavutil/time_internal.h"
@@ -42,8 +43,6 @@ typedef struct VideoMuxData {
int start_img_number; int start_img_number;
int img_number; int img_number;
int split_planes; /**< use independent file for each Y, U, V plane */ int split_planes; /**< use independent file for each Y, U, V plane */
char tmp[4][1024];
char target[4][1024];
int update; int update;
int use_strftime; int use_strftime;
int frame_pts; int frame_pts;
@@ -141,11 +140,12 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
VideoMuxData *img = s->priv_data; VideoMuxData *img = s->priv_data;
AVIOContext *pb[4] = {0}; AVIOContext *pb[4] = {0};
char* target[4] = {0};
char* tmp[4] = {0};
char filename[1024]; char filename[1024];
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(par->format); const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(par->format);
int ret, i; int ret, i;
int nb_renames = 0;
AVDictionary *options = NULL; AVDictionary *options = NULL;
if (img->update) { if (img->update) {
@@ -180,10 +180,16 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
av_dict_copy(&options, img->protocol_opts, 0); av_dict_copy(&options, img->protocol_opts, 0);
snprintf(img->tmp[i], sizeof(img->tmp[i]), "%s.tmp", filename); if (img->use_rename) {
av_strlcpy(img->target[i], filename, sizeof(img->target[i])); tmp[i] = av_asprintf("%s.tmp", filename);
if (s->io_open(s, &pb[i], img->use_rename ? img->tmp[i] : filename, AVIO_FLAG_WRITE, &options) < 0) { target[i] = av_strdup(filename);
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", img->use_rename ? img->tmp[i] : filename); if (!tmp[i] || !target[i]) {
ret = AVERROR(ENOMEM);
goto fail;
}
}
if (s->io_open(s, &pb[i], tmp[i] ? tmp[i] : filename, AVIO_FLAG_WRITE, &options) < 0) {
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n", tmp[i] ? tmp[i] : filename);
ret = AVERROR(EIO); ret = AVERROR(EIO);
goto fail; goto fail;
} }
@@ -197,8 +203,6 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
break; break;
filename[strlen(filename) - 1] = "UVAx"[i]; filename[strlen(filename) - 1] = "UVAx"[i];
} }
if (img->use_rename)
nb_renames = i + 1;
if (img->split_planes) { if (img->split_planes) {
int ysize = par->width * par->height; int ysize = par->width * par->height;
@@ -223,10 +227,12 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
for (i = 0; i < nb_renames; i++) { for (i = 0; i < 4 && tmp[i]; i++) {
int ret = ff_rename(img->tmp[i], img->target[i], s); int ret = ff_rename(tmp[i], target[i], s);
if (ret < 0) if (ret < 0)
return ret; goto fail;
av_freep(&tmp[i]);
av_freep(&target[i]);
} }
img->img_number++; img->img_number++;
@@ -234,9 +240,12 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
fail: fail:
av_dict_free(&options); av_dict_free(&options);
for (i = 0; i < FF_ARRAY_ELEMS(pb); i++) for (i = 0; i < FF_ARRAY_ELEMS(pb); i++) {
av_freep(&tmp[i]);
av_freep(&target[i]);
if (pb[i]) if (pb[i])
ff_format_io_close(s, &pb[i]); ff_format_io_close(s, &pb[i]);
}
return ret; return ret;
} }