From d5b2d8e0810d2f6fb6e45d583cd9dea87bf40259 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 15 Feb 2010 17:40:35 +0000
Subject: [PATCH] fix compiler warning: conversion from "long" to "size_t" may
lose sign
---
tests/server/rtspd.c | 17 ++++++++++++++---
tests/server/sws.c | 17 ++++++++++++++---
2 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index efa0e0b4e0..c10b829aa1 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -578,10 +578,21 @@ static int ProcessRequest(struct httprequest *req)
request including the body before we return. If we've been told to
ignore the content-length, we will return as soon as all headers
have been received */
- size_t cl = strtol(line+15, &line, 10);
- req->cl = cl - req->skip;
+ char *endptr;
+ char *ptr = line + 15;
+ unsigned long clen = 0;
+ while(*ptr && (' ' == *ptr))
+ ptr++;
+ clen = strtoul(ptr, &endptr, 10);
+ if((ptr == endptr) || ERRNO) {
+ /* this assumes that a zero Content-Length is valid */
+ logmsg("Found invalid Content-Length: (%s) in the request", ptr);
+ req->open = FALSE; /* closes connection */
+ return 1; /* done */
+ }
+ req->cl = clen - req->skip;
- logmsg("Found Content-Length: %zu in the request", cl);
+ logmsg("Found Content-Length: %lu in the request", clen);
if(req->skip)
logmsg("... but will abort after %zu bytes", req->cl);
break;
diff --git a/tests/server/sws.c b/tests/server/sws.c
index e1dfe45d84..b12b670b57 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -497,10 +497,21 @@ static int ProcessRequest(struct httprequest *req)
request including the body before we return. If we've been told to
ignore the content-length, we will return as soon as all headers
have been received */
- size_t cl = strtol(line+15, &line, 10);
- req->cl = cl - req->skip;
+ char *endptr;
+ char *ptr = line + 15;
+ unsigned long clen = 0;
+ while(*ptr && (' ' == *ptr))
+ ptr++;
+ clen = strtoul(ptr, &endptr, 10);
+ if((ptr == endptr) || ERRNO) {
+ /* this assumes that a zero Content-Length is valid */
+ logmsg("Found invalid Content-Length: (%s) in the request", ptr);
+ req->open = FALSE; /* closes connection */
+ return 1; /* done */
+ }
+ req->cl = clen - req->skip;
- logmsg("Found Content-Length: %zu in the request", cl);
+ logmsg("Found Content-Length: %lu in the request", clen);
if(req->skip)
logmsg("... but will abort after %zu bytes", req->cl);
break;
--
GitLab