summaryrefslogtreecommitdiffstats
path: root/master/fix-mjpg-streamer-stack-smashing
diff options
context:
space:
mode:
authorJames <>2015-11-08 10:00:58 +0000
committerJames <>2015-11-08 10:00:58 +0000
commit680ce76497b2d58a3d0abb002984d3dc2bbc8887 (patch)
tree33f63da313b893a7c8707c65cd5d67c16e4c74c6 /master/fix-mjpg-streamer-stack-smashing
downloadtrunk-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-smashing19
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;