[nginx] svn commit: r5161 - in branches/stable-1.2: . src/http/modules

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-03-29 17:59:41 +0000 (Fri, 29 Mar 2013)
New Revision: 5161
URL: http://trac.nginx.org/nginx/changeset/5161/nginx

Log:
Merge of r5129: split clients configuration parsing.

Split clients: check length when parsing configuration.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/modules/ngx_http_split_clients_module.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-03-29 17:53:47 UTC (rev 5160)
+++ branches/stable-1.2	2013-03-29 17:59:41 UTC (rev 5161)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078,5082-5083,5098,5109,5113-5114,5117,5123,5127-5128
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4949,4961-4969,4973-4974,4976-4994,4997,4999-5005,5011-5025,5027-5031,5066,5070-5071,5078,5082-5083,5098,5109,5113-5114,5117,5123,5127-5129
\ No newline at end of property
Modified: branches/stable-1.2/src/http/modules/ngx_http_split_clients_module.c
===================================================================
--- branches/stable-1.2/src/http/modules/ngx_http_split_clients_module.c	2013-03-29 17:53:47 UTC (rev 5160)
+++ branches/stable-1.2/src/http/modules/ngx_http_split_clients_module.c	2013-03-29 17:59:41 UTC (rev 5161)
@@ -218,7 +218,7 @@
         part->percent = 0;
 
     } else {
-        if (value[0].data[value[0].len - 1] != '%') {
+        if (value[0].len == 0 || value[0].data[value[0].len - 1] != '%') {
             goto invalid;
         }