From patchwork Tue Jul 5 12:19:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 644719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rkNHD3ghtz9s1h for ; Tue, 5 Jul 2016 22:19:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=Wra1tyFD; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= lFrXal1wsDA6vf3FRvCkLhKfsHxdYFyVfu/PT6t6woSCnCqXWO1FvmRc7gsoZkYi lavvHtDtEMCtmnz9qpiZSOKwSeENeHWcDol3QMZv0T9UqYQhgUjoUjSxuDJF1pFA UYsZEaAqJT9A7jaksf4VpeyPh0X2ndSJqApy410Z/pk= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=sfPDTb rDZ3q02OlJexe4bTwEWDA=; b=Wra1tyFDcF5YPIDcrBxm8+mZj/zPTMY+fpo9yi PI2tS4YpRt2H+pWy3AR3XtgFO2bRtXp0Qpv6OdeCmRSmwvlf85uUoS+huLWwc/kN tD6D9b38JIOgABaROclUG9BHJoU4ij/J8qo1zlyTqj3cj9QjOto1gYoS1Nxxseyn pwW3M= Received: (qmail 73457 invoked by alias); 5 Jul 2016 12:19:30 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 73442 invoked by uid 89); 5 Jul 2016 12:19:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=padding X-HELO: mx1.redhat.com Date: Tue, 05 Jul 2016 14:19:16 +0200 To: libc-alpha@sourceware.org Subject: [PATCH] string: Additional test for strcmp, strcasecmp User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20160705121916.AEF964025EC44@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2016-07-05 Florian Weimer * string/tst-cmp.c: New test. * string/Makefile (tests): Add it. diff --git a/string/Makefile b/string/Makefile index 9c87419..69d3f80 100644 --- a/string/Makefile +++ b/string/Makefile @@ -54,7 +54,7 @@ tests := tester inl-tester noinl-tester testcopy test-ffs \ tst-strtok tst-strxfrm bug-strcoll1 tst-strfry \ bug-strtok1 $(addprefix test-,$(strop-tests)) \ bug-envz1 tst-strxfrm2 tst-endian tst-svc2 \ - tst-strtok_r bug-strcoll2 + tst-strtok_r bug-strcoll2 tst-cmp xtests = tst-strcoll-overflow diff --git a/string/tst-cmp.c b/string/tst-cmp.c new file mode 100644 index 0000000..3e0e60c --- /dev/null +++ b/string/tst-cmp.c @@ -0,0 +1,119 @@ +/* Alignment/padding coverage test for strcmp, strcasecmp. + Copyright (C) 2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This performs test comparisons with various (mis)alignments and + characters in the padding. It is partly a regression test for + bug 20327. */ + +#include +#include +#include +#include +#include + +static int +signum (int val) +{ + if (val < 0) + return -1; + if (val > 0) + return 1; + else + return 0; +} + +static int +do_test (void) +{ + enum { + max_align = 64, + max_string_length = 33 + }; + size_t blob_size = max_align + max_string_length + 1; + char *left = memalign (max_align, blob_size); + char *right = memalign (max_align, blob_size); + if (left == NULL || right == NULL) + { + printf ("error: out of memory\n"); + return 1; + } + + const char *funcs[2] = { "strcmp", "strcasecmp" }; + const char *const strings[] = + { + "", + "0", + "01234567", + "0123456789abcde", + "0123456789abcdef", + "0123456789abcdefg", + "123456789abcdef", + "abcdefghijklmnopqrstuvwxyzABCDEF", + NULL + }; + const unsigned char pads[] = + { 0, 1, 32, 64, 128, 48, 63, 127, 192, 255 }; + + bool errors = false; + for (int use_casecmp = 0; use_casecmp < 2; ++use_casecmp) + for (int left_idx = 0; strings[left_idx] != NULL; ++left_idx) + for (unsigned pad_left = 0; pad_left < sizeof (pads); ++pad_left) + for (int left_align = 0; left_align < max_align; ++left_align) + { + memset (left, pads[pad_left], blob_size); + strcpy (left + left_align, strings[left_idx]); + for (int right_idx = 0; strings[right_idx] != NULL; ++right_idx) + for (unsigned pad_right = 0; pad_right < sizeof (pads); + ++pad_right) + for (int right_align = 0; right_align < max_align; + ++right_align) + { + memset (right, pads[pad_right], blob_size); + strcpy (right + right_align, strings[right_idx]); + + int expected = left_idx - right_idx; + int actual; + if (use_casecmp) + actual = strcasecmp (left + left_align, + right + right_align); + else + actual = strcmp (left + left_align, + right + right_align); + + if (signum (actual) != signum (expected)) + { + printf ("error: mismatch for %s: %d\n" + " left: \"%s\"\n" + " right: \"%s\"\n" + " pad_left = %u, pad_right = %u,\n" + " left_align = %d, right_align = %d\n", + funcs[use_casecmp], actual, + strings[left_idx], strings[right_idx], + pad_left, pad_right, left_align, right_align); + errors = true; + } + } + } + + free (right); + free (left); + return errors; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c"