Mercurial > hg > release > icedtea6-1.12
view patches/openjdk/8006536-remove_trailing_slashes.patch @ 3009:ce5dbd04cea5
Backport additional fixes.
Additional fixes were applied to jdk7u as part of the security release.
This patch includes a subset of them.
2013-07-01 Omair Majid <omajid@redhat.com>
* patches/openjdk/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch,
* patches/openjdk/8009217-fix_test_compile.patch,
* patches/openjdk/8009463-space_and_final_backslash.patch,
* patches/openjdk/8009610-blacklist_malware_certificate.patch,
* patches/openjdk/8010213-set_socketoptions_windows.patch,
* patches/openjdk/8010714-xml_dsig_retrievalmethod.patch,
* patches/openjdk/8011154-awt_regresssion.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011992-MlibOpsTest_failed.patch,
* patches/openjdk/8012112-MlibOpsTest_fails.patch,
* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
* patches/openjdk/8012933-appcontext_disposed_too_early.patch,
* patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014427-raster_regresssion.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch: New file.
Backport from icedtea/openjdk 7.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* patches/ecj/override.patch: Add new hunk for BufferedImage.
* NEWS: Update with backports.
author | Andrew John Hughes <gnu.andrew@redhat.com> |
---|---|
date | Wed, 10 Jul 2013 13:59:14 +0100 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User andrew # Date 1372302908 18000 # Node ID b904ff04371605b2bd33ea6f80794585cf6eb84c # Parent 4f08c170e2daef20a8b249ba50a9986f7cd09e67 8006536: [launcher] removes trailing slashes on arguments Reviewed-by: ksrini, akhil Contributed-by: jviswana@linux.vnet.ibm.com --- openjdk/jdk/src/windows/bin/cmdtoargs.c +++ openjdk/jdk/src/windows/bin/cmdtoargs.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -104,6 +104,11 @@ case ' ': case '\t': + if (prev == '\\') { + for (i = 0 ; i < slashes; i++) { + *dest++ = prev; + } + } if (quotes % 2 == 1) { *dest++ = ch; } else { @@ -591,6 +596,12 @@ // v->disable(); vectors[i++] = v; + v= new Vector(argv[0], "a b\\\\ d"); + v->add("a", FALSE); + v->add("b\\\\", FALSE); + v->add("d", FALSE); + vectors[i++] = v; + dotest(vectors); printf("All tests pass [%d]\n", i); doexit(0);