easthighNerd/qcma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix memory leak by using the correct avcodec function.

Browse Source 
Fix unitialized variable reported by valgrind.
This commit is contained in:
codestation
2015-05-27 22:42:48 -04:30
parent 613dd97561
commit 88364042f8
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/avdecoder.cpp
View File

@@ -24,7 +24,6 @@
#include <QBuffer> #include <QBuffer>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QImage>
#include <QSettings> #include <QSettings>
AVDecoder::AvInit init; AVDecoder::AvInit init;
@@ -157,12 +156,7 @@ bool AVDecoder::seekVideo(int percentage)
qint64 seek_pos = pFormatCtx->duration * percentage / (AV_TIME_BASE * 100); qint64 seek_pos = pFormatCtx->duration * percentage / (AV_TIME_BASE * 100);
qint64 frame = av_rescale(seek_pos, av_stream->time_base.den, av_stream->time_base.num); qint64 frame = av_rescale(seek_pos, av_stream->time_base.den, av_stream->time_base.num);
if(avformat_seek_file(pFormatCtx, stream_index, 0, frame, frame, AVSEEK_FLAG_FRAME) < 0) { return avformat_seek_file(pFormatCtx, stream_index, 0, frame, frame, AVSEEK_FLAG_FRAME) >= 0;
avcodec_close(pCodecCtx);
return false;
}
return true;
} }
static void calculate_thumbnail_dimensions(int src_width, int src_height, static void calculate_thumbnail_dimensions(int src_width, int src_height,
@@ -215,8 +209,6 @@ QByteArray AVDecoder::getThumbnail(int &width, int &height)
#endif #endif
} }
avcodec_close(pCodecCtx);
return data; return data;
} }
@@ -241,7 +233,6 @@ QByteArray AVDecoder::WriteJPEG(AVCodecContext *pCodecCtx, AVFrame *pFrame, int
NULL, NULL, NULL); NULL, NULL, NULL);
if(!sws_ctx) { if(!sws_ctx) {
avcodec_close(pCodecCtx);
return data; return data;
} }
@@ -285,6 +276,7 @@ QByteArray AVDecoder::WriteJPEG(AVCodecContext *pCodecCtx, AVFrame *pFrame, int
pOCodecCtx = avcodec_alloc_context3(pOCodec); pOCodecCtx = avcodec_alloc_context3(pOCodec);
if(pOCodecCtx == NULL) { if(pOCodecCtx == NULL) {
avcodec_free_context(&pOCodecCtx);
av_free(buffer); av_free(buffer);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
av_frame_free(&pFrameRGB); av_frame_free(&pFrameRGB);
@@ -306,6 +298,14 @@ QByteArray AVDecoder::WriteJPEG(AVCodecContext *pCodecCtx, AVFrame *pFrame, int
AVDictionary *opts = NULL; AVDictionary *opts = NULL;
if(avcodec_open2(pOCodecCtx, pOCodec, &opts) < 0) { if(avcodec_open2(pOCodecCtx, pOCodec, &opts) < 0) {
avcodec_free_context(&pOCodecCtx);
av_free(buffer);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
av_frame_free(&pFrameRGB);
#else
av_free(&pFrameRGB);
#endif
sws_freeContext(sws_ctx);
return 0; return 0;
} }
@@ -327,8 +327,8 @@ QByteArray AVDecoder::WriteJPEG(AVCodecContext *pCodecCtx, AVFrame *pFrame, int
avcodec_encode_video2(pOCodecCtx, &pkt, pFrameRGB, &gotPacket); avcodec_encode_video2(pOCodecCtx, &pkt, pFrameRGB, &gotPacket);
QByteArray buffer2(reinterpret_cast<char *>(pkt.data), pkt.size); QByteArray buffer2(reinterpret_cast<char *>(pkt.data), pkt.size);
avcodec_close(pOCodecCtx);
avcodec_free_context(&pOCodecCtx);
av_free(buffer); av_free(buffer);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
av_frame_free(&pFrameRGB); av_frame_free(&pFrameRGB);

3
gui/main.cpp
View File

@@ -51,6 +51,9 @@ static bool setup_handlers()
{ {
struct sigaction hup, term; struct sigaction hup, term;
memset(&hup, 0, sizeof(hup));
memset(&term, 0, sizeof(term));
hup.sa_handler = ClientManager::hupSignalHandler; hup.sa_handler = ClientManager::hupSignalHandler;
sigemptyset(&hup.sa_mask); sigemptyset(&hup.sa_mask);
hup.sa_flags = 0; hup.sa_flags = 0;