diff options
| author | root <root@lamia.panaceas.james.local> | 2016-11-10 10:20:42 +0000 |
|---|---|---|
| committer | root <root@lamia.panaceas.james.local> | 2016-11-10 10:20:42 +0000 |
| commit | a0e9b4c2ecdc394b21ffa77aa0c578818edad4f1 (patch) | |
| tree | 201144b9b4ee9483a634c2aa9624ee664ba97622 /master/fix-mjpg-streamer-stack-smashing | |
| parent | f84bb1e6f499eccbf06605884b0b2cbb7adfb46e (diff) | |
| download | trunk-47381-pq-master.tar.gz trunk-47381-pq-master.tar.bz2 trunk-47381-pq-master.zip | |
Diffstat (limited to 'master/fix-mjpg-streamer-stack-smashing')
| -rw-r--r-- | master/fix-mjpg-streamer-stack-smashing | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/master/fix-mjpg-streamer-stack-smashing b/master/fix-mjpg-streamer-stack-smashing new file mode 100644 index 0000000..9d70159 --- /dev/null +++ b/master/fix-mjpg-streamer-stack-smashing @@ -0,0 +1,19 @@ +diff --git a/feeds/packages/multimedia/mjpg-streamer/patches/998-fix-stack-smashing.patch b/feeds/packages/multimedia/mjpg-streamer/patches/998-fix-stack-smashing.patch +new file mode 100644 +index 0000000..a1a2239 +--- /dev/null ++++ b/feeds/packages/multimedia/mjpg-streamer/patches/998-fix-stack-smashing.patch +@@ -0,0 +1,13 @@ ++Index: mjpg-streamer-r182/plugins/input_uvc/v4l2uvc.c ++=================================================================== ++--- a/plugins/input_uvc/v4l2uvc.c +++++ b/plugins/input_uvc/v4l2uvc.c ++@@ -130,7 +130,7 @@ int init_videoIn(struct vdIn *vd, char * ++ return -1; ++ } ++ ++- memcpy(&pglobal->in[id].in_formats[pglobal->in[id].formatCount], &fmtdesc, sizeof(input_format)); +++ memcpy(&pglobal->in[id].in_formats[pglobal->in[id].formatCount], &fmtdesc, sizeof(struct v4l2_fmtdesc)); ++ ++ if(fmtdesc.pixelformat == format) ++ pglobal->in[id].currentFormat = pglobal->in[id].formatCount; |