commit 1899a24a9ff58fb7a50568184b1046f3e0343dd1
parent 774c461f8a24c2c89cee95c22f187bc277974e0b
Author: Christian Grothoff <christian@grothoff.org>
Date: Sat, 11 Jul 2020 19:12:40 +0200
Merge branch 'master' of git+ssh://gnunet.org/libmicrohttpd
Diffstat:
5 files changed, 52 insertions(+), 34 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+Fri Jul 10 15:04:51 CEST 2020
+ Fixed Postprocessor URL-encoded parsing if '%' fell on boundary. -CG/MD
+
Thu 02 Jul 2020 09:56:23 PM CEST
Fixed return type of MHD_queue_basic_auth_fail_response. -CA/CG
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
@@ -132,7 +132,7 @@ typedef intptr_t ssize_t;
* Current version of the library.
* 0x01093001 = 1.9.30-1.
*/
-#define MHD_VERSION 0x00097002
+#define MHD_VERSION 0x00097101
/**
* Operational results from MHD calls.
@@ -180,7 +180,7 @@ enum MHD_Result
#define _MHD_EXTERN extern
#elif defined (_WIN32) && defined(MHD_W32DLL)
/* Define MHD_W32DLL when using MHD as W32 .DLL to speed up linker a little */
-#define _MHD_EXTERN __declspec(dllimport)
+#define _MHD_EXTERN __declspec (dllimport)
#else
#define _MHD_EXTERN extern
#endif
@@ -262,10 +262,10 @@ typedef SOCKET MHD_socket;
#ifndef _MHD_DEPR_FUNC
#if defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1400
/* VS 2005 or later */
-#define _MHD_DEPR_FUNC(msg) __declspec(deprecated (msg))
+#define _MHD_DEPR_FUNC(msg) __declspec (deprecated (msg))
#elif defined(_MSC_FULL_VER) && _MSC_VER + 0 >= 1310
/* VS .NET 2003 deprecation do not support custom messages */
-#define _MHD_DEPR_FUNC(msg) __declspec(deprecated)
+#define _MHD_DEPR_FUNC(msg) __declspec (deprecated)
#elif (__GNUC__ + 0 >= 5) || (defined (__clang__) && \
(__clang_major__ + 0 > 2 || (__clang_major__ + 0 == 2 && __clang_minor__ >= \
9))) /* FIXME: earlier versions not tested */
diff --git a/src/microhttpd/postprocessor.c b/src/microhttpd/postprocessor.c
@@ -353,21 +353,17 @@ MHD_create_post_processor (struct MHD_Connection *connection,
/**
- * Give a (possibly partial) value to the
- * application callback. We have some
- * part of the value in the 'pp->xbuf', the
- * rest is between @a value_start and @a value_end.
- * If @a last_escape is non-NULL, there may be
- * an incomplete escape sequence at at @a value_escape
- * between @a value_start and @a value_end which
- * we should preserve in 'pp->xbuf' for the future.
+ * Give a (possibly partial) value to the application callback. We have some
+ * part of the value in the 'pp->xbuf', the rest is between @a value_start and
+ * @a value_end. If @a last_escape is non-NULL, there may be an incomplete
+ * escape sequence at at @a value_escape between @a value_start and @a
+ * value_end which we should preserve in 'pp->xbuf' for the future.
*
- * Unescapes the value and calls the iterator
- * together with the key. The key must already
- * be in the key buffer allocated and 0-terminated
- * at the end of @a pp at the time of the call.
+ * Unescapes the value and calls the iterator together with the key. The key
+ * must already be in the key buffer allocated and 0-terminated at the end of
+ * @a pp at the time of the call.
*
- * @param pp post processor to act upon
+ * @param[in,out] pp post processor to act upon
* @param value_start where in memory is the value
* @param value_end where does the value end
* @param last_escape last '%'-sign in value range,
@@ -404,6 +400,7 @@ process_value (struct MHD_PostProcessor *pp,
(xoff > 0) )
{
size_t delta = value_end - value_start;
+ bool cut = false;
if (delta > XBUF_SIZE - xoff)
delta = XBUF_SIZE - xoff;
@@ -414,14 +411,23 @@ process_value (struct MHD_PostProcessor *pp,
/* find if escape sequence is at the end of the processing buffer;
if so, exclude those from processing (reduce delta to point at
end of processed region) */
- if (delta >= XBUF_SIZE - 2)
+ if ( (xoff + delta > 0) &&
+ ('%' == xbuf[xoff + delta - 1]) )
{
- if ((xoff + delta > 0) &&
- ('%' == xbuf[xoff + delta - 1]))
- delta--;
- else if ((xoff + delta > 1) &&
- ('%' == xbuf[xoff + delta - 2]))
- delta -= 2;
+ cut = (delta != XBUF_SIZE - xoff);
+ delta--;
+ pp->xbuf[0] = '%';
+ pp->xbuf_pos = 1;
+ }
+ else if ( (xoff + delta > 1) &&
+ ('%' == xbuf[xoff + delta - 2]) )
+ {
+ memcpy (pp->xbuf,
+ &xbuf[xoff + delta - 2],
+ 2);
+ pp->xbuf_pos = 2;
+ cut = (delta != XBUF_SIZE - xoff);
+ delta -= 2;
}
xoff += delta;
value_start += delta;
@@ -447,6 +453,8 @@ process_value (struct MHD_PostProcessor *pp,
}
pp->value_offset += xoff;
xoff = 0;
+ if (cut)
+ break;
}
}
diff --git a/src/microhttpd/test_postprocessor.c b/src/microhttpd/test_postprocessor.c
@@ -1,6 +1,6 @@
/*
This file is part of libmicrohttpd
- Copyright (C) 2007,2013,2019 Christian Grothoff
+ Copyright (C) 2007, 2013, 2019, 2020 Christian Grothoff
libmicrohttpd is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
diff --git a/src/microhttpd/test_postprocessor_md.c b/src/microhttpd/test_postprocessor_md.c
@@ -114,13 +114,22 @@ post_data_iterator2 (void *cls,
uint64_t off,
size_t size)
{
- printf ("%s\t%s\n", key, data);
+ static char seen[16];
+
+ printf ("%s\t%s@ %llu\n",
+ key,
+ data,
+ (unsigned long long) off);
if (0 == strcmp (key, "text"))
{
- if ( (10 != size) ||
- (0 != memcmp (data, "text, text", 10)) )
- exit (5);
- found |= 1;
+ if (off + size > sizeof (seen))
+ exit (6);
+ memcpy (&seen[off],
+ data,
+ size);
+ if ( (10 == off + size) &&
+ (0 == memcmp (seen, "text, text", 10)) )
+ found |= 1;
}
return MHD_YES;
}
@@ -177,7 +186,6 @@ main (int argc, char *argv[])
exit (3);
if (found != 15)
exit (2);
-
found = 0;
postprocessor = malloc (sizeof (struct MHD_PostProcessor)
+ 0x1000 + 1);
@@ -191,9 +199,8 @@ main (int argc, char *argv[])
postprocessor->buffer_size = 0x1000;
postprocessor->state = PP_Init;
postprocessor->skip_rn = RN_Inactive;
- MHD_post_process (postprocessor, "text=text%2C+text", 11 + 6);
- // MHD_post_process (postprocessor, "text=text%2", 11);
- // MHD_post_process (postprocessor, "C+text", 6);
+ MHD_post_process (postprocessor, "text=text%2", 11);
+ MHD_post_process (postprocessor, "C+text", 6);
MHD_post_process (postprocessor, "", 0);
MHD_destroy_post_processor (postprocessor);
if (found != 1)
