From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-media@vger.kernel.org
Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl
Subject: [PATCH v2 1/1] v4l: libv4l2subdev: Precisely convert media bus string to code
Date: Mon, 25 Jan 2016 14:35:06 +0200 [thread overview]
Message-ID: <1453725306-4047-1-git-send-email-sakari.ailus@linux.intel.com> (raw)
Any character beyond the fist `length' characters in the mbus_formats
strings are ignored, causing incorrect matches if the format entry starts
with but isn't equal to the passed format.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
since v1:
- Use mbus_formats[i].name[length] == '\0' instead of comparing strlen()
result.
utils/media-ctl/libv4l2subdev.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c
index 33c1ee6..dc2cd87 100644
--- a/utils/media-ctl/libv4l2subdev.c
+++ b/utils/media-ctl/libv4l2subdev.c
@@ -769,14 +769,12 @@ enum v4l2_mbus_pixelcode v4l2_subdev_string_to_pixelcode(const char *string,
unsigned int i;
for (i = 0; i < ARRAY_SIZE(mbus_formats); ++i) {
- if (strncmp(mbus_formats[i].name, string, length) == 0)
- break;
+ if (strncmp(mbus_formats[i].name, string, length) == 0
+ && mbus_formats[i].name[length] == '\0')
+ return mbus_formats[i].code;
}
- if (i == ARRAY_SIZE(mbus_formats))
- return (enum v4l2_mbus_pixelcode)-1;
-
- return mbus_formats[i].code;
+ return (enum v4l2_mbus_pixelcode)-1;
}
static struct {
--
2.1.0.231.g7484e3b
next reply other threads:[~2016-01-25 12:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-25 12:35 Sakari Ailus [this message]
2016-01-25 19:41 ` [PATCH v2 1/1] v4l: libv4l2subdev: Precisely convert media bus string to code Laurent Pinchart
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453725306-4047-1-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=hverkuil@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.