From e1e5abe19197f2bb56a9d320b31275db4706aa4d Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Fri, 15 Jun 2018 22:27:11 +0000
Subject: [PATCH] Fixed some security issues
---
src/image.c | 94 +++++++++++++++++++++++++++++++++-------------
1 files changed, 67 insertions(+), 27 deletions(-)
diff --git a/src/image.c b/src/image.c
index eb8c6d5..5313964 100644
--- a/src/image.c
+++ b/src/image.c
@@ -536,7 +536,7 @@
cvRectangle(show_img, pt1, pt2, color, width, 8, 0);
if (ext_output)
printf("\t(left_x: %4.0f top_y: %4.0f width: %4.0f height: %4.0f)\n",
- (float)left, (float)right, b.w*show_img->width, b.h*show_img->height);
+ (float)left, (float)top, b.w*show_img->width, b.h*show_img->height);
else
printf("\n");
cvRectangle(show_img, pt_text_bg1, pt_text_bg2, color, width, 8, 0);
@@ -957,7 +957,7 @@
{
IplImage* src = 0;
int flag = -1;
- if (channels == 0) flag = -1;
+ if (channels == 0) flag = 1;
else if (channels == 1) flag = 0;
else if (channels == 3) flag = 1;
else {
@@ -966,16 +966,22 @@
if( (src = cvLoadImage(filename, flag)) == 0 )
{
- fprintf(stderr, "Cannot load image \"%s\"\n", filename);
- char buff[256];
- sprintf(buff, "echo %s >> bad.list", filename);
- system(buff);
+ char shrinked_filename[1024];
+ if (strlen(filename) >= 1024) sprintf(shrinked_filename, "name is too long");
+ else sprintf(shrinked_filename, "%s", filename);
+ fprintf(stderr, "Cannot load image \"%s\"\n", shrinked_filename);
+ FILE* fw = fopen("bad.list", "a");
+ fwrite(shrinked_filename, sizeof(char), strlen(shrinked_filename), fw);
+ char *new_line = "\n";
+ fwrite(new_line, sizeof(char), strlen(new_line), fw);
+ fclose(fw);
return make_image(10,10,3);
//exit(EXIT_FAILURE);
}
image out = ipl_to_image(src);
cvReleaseImage(&src);
- rgbgr_image(out);
+ if (out.c > 1)
+ rgbgr_image(out);
return out;
}
@@ -1010,8 +1016,29 @@
return im;
}
-image get_image_from_stream_resize(CvCapture *cap, int w, int h, IplImage** in_img, int cpp_video_capture)
+int wait_for_stream(CvCapture *cap, IplImage* src, int dont_close) {
+ if (!src) {
+ if (dont_close) src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, 3);
+ else return 0;
+ }
+ if (src->width < 1 || src->height < 1 || src->nChannels < 1) {
+ if (dont_close) {
+ cvReleaseImage(&src);
+ int z = 0;
+ for (z = 0; z < 20; ++z) {
+ get_webcam_frame(cap);
+ cvReleaseImage(&src);
+ }
+ src = cvCreateImage(cvSize(416, 416), IPL_DEPTH_8U, 3);
+ }
+ else return 0;
+ }
+ return 1;
+}
+
+image get_image_from_stream_resize(CvCapture *cap, int w, int h, int c, IplImage** in_img, int cpp_video_capture, int dont_close)
{
+ c = c ? c : 3;
IplImage* src;
if (cpp_video_capture) {
static int once = 1;
@@ -1027,16 +1054,17 @@
}
else src = cvQueryFrame(cap);
- if (!src) return make_empty_image(0, 0, 0);
- if (src->width < 1 || src->height < 1 || src->nChannels < 1) return make_empty_image(0, 0, 0);
- IplImage* new_img = cvCreateImage(cvSize(w, h), IPL_DEPTH_8U, 3);
- *in_img = cvCreateImage(cvSize(src->width, src->height), IPL_DEPTH_8U, 3);
+ if (cpp_video_capture)
+ if(!wait_for_stream(cap, src, dont_close)) return make_empty_image(0, 0, 0);
+ IplImage* new_img = cvCreateImage(cvSize(w, h), IPL_DEPTH_8U, c);
+ *in_img = cvCreateImage(cvSize(src->width, src->height), IPL_DEPTH_8U, c);
cvResize(src, *in_img, CV_INTER_LINEAR);
cvResize(src, new_img, CV_INTER_LINEAR);
image im = ipl_to_image(new_img);
cvReleaseImage(&new_img);
if (cpp_video_capture) cvReleaseImage(&src);
- rgbgr_image(im);
+ if (c>1)
+ rgbgr_image(im);
return im;
}
@@ -1589,16 +1617,23 @@
void distort_image(image im, float hue, float sat, float val)
{
- rgb_to_hsv(im);
- scale_image_channel(im, 1, sat);
- scale_image_channel(im, 2, val);
- int i;
- for(i = 0; i < im.w*im.h; ++i){
- im.data[i] = im.data[i] + hue;
- if (im.data[i] > 1) im.data[i] -= 1;
- if (im.data[i] < 0) im.data[i] += 1;
- }
- hsv_to_rgb(im);
+ if (im.c >= 3)
+ {
+ rgb_to_hsv(im);
+ scale_image_channel(im, 1, sat);
+ scale_image_channel(im, 2, val);
+ int i;
+ for(i = 0; i < im.w*im.h; ++i){
+ im.data[i] = im.data[i] + hue;
+ if (im.data[i] > 1) im.data[i] -= 1;
+ if (im.data[i] < 0) im.data[i] += 1;
+ }
+ hsv_to_rgb(im);
+ }
+ else
+ {
+ scale_image_channel(im, 0, val);
+ }
constrain_image(im);
}
@@ -1734,10 +1769,15 @@
int w, h, c;
unsigned char *data = stbi_load(filename, &w, &h, &c, channels);
if (!data) {
- fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", filename, stbi_failure_reason());
- char buff[256];
- sprintf(buff, "echo %s >> bad.list", filename);
- system(buff);
+ char shrinked_filename[1024];
+ if (strlen(filename) >= 1024) sprintf(shrinked_filename, "name is too long");
+ else sprintf(shrinked_filename, "%s", filename);
+ fprintf(stderr, "Cannot load image \"%s\"\nSTB Reason: %s\n", shrinked_filename, stbi_failure_reason());
+ FILE* fw = fopen("bad.list", "a");
+ fwrite(shrinked_filename, sizeof(char), strlen(shrinked_filename), fw);
+ char *new_line = "\n";
+ fwrite(new_line, sizeof(char), strlen(new_line), fw);
+ fclose(fw);
return make_image(10, 10, 3);
//exit(EXIT_FAILURE);
}
--
Gitblit v1.10.0