diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-games/ode/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-games/ode/files')
-rw-r--r-- | dev-games/ode/files/ode-0.14-gcc7.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/dev-games/ode/files/ode-0.14-gcc7.patch b/dev-games/ode/files/ode-0.14-gcc7.patch new file mode 100644 index 000000000000..aad0117f3bec --- /dev/null +++ b/dev-games/ode/files/ode-0.14-gcc7.patch @@ -0,0 +1,52 @@ +Bug: https://bugs.gentoo.org/646538 +Upstream commit: https://bitbucket.org/odedevs/ode/commits/6f44023660dc830147a56314ea0627a23f11ad86 + +# HG changeset patch +# User oleh_derevenko <> +# Date 1521993135 -10800 +# Node ID 6f44023660dc830147a56314ea0627a23f11ad86 +# Parent 6a68227619feebf85513331d7320b5a89eadf44f +Fixed: Command line parameter validation errors have been fixed in some demos (reported by Peter Levine) + +diff --git a/ode/demo/demo_jointPR.cpp b/ode/demo/demo_jointPR.cpp +--- a/ode/demo/demo_jointPR.cpp ++++ b/ode/demo/demo_jointPR.cpp +@@ -328,8 +328,8 @@ + if (0 == strcmp("-t", argv[i]) || 0 == strcmp("--texture-path", argv[i])) + { + int j = i+1; +- if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ if ( j >= argc || // Check if we have enough arguments ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help(argv); + else +diff --git a/ode/demo/demo_jointPU.cpp b/ode/demo/demo_jointPU.cpp +--- a/ode/demo/demo_jointPU.cpp ++++ b/ode/demo/demo_jointPU.cpp +@@ -575,8 +575,8 @@ + + if (0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) { + int j = i+1; +- if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ if ( j >= argc || // Check if we have enough arguments ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help (argv); + else +diff --git a/ode/demo/demo_piston.cpp b/ode/demo/demo_piston.cpp +--- a/ode/demo/demo_piston.cpp ++++ b/ode/demo/demo_piston.cpp +@@ -658,8 +658,8 @@ + if ( 0 == strcmp ("-t", argv[i]) || 0 == strcmp ("--texture-path", argv[i]) ) + { + int j = i+1; +- if ( j+1 > argc || // Check if we have enough arguments +- argv[j] == '\0' || // We should have a path here ++ if ( j >= argc || // Check if we have enough arguments ++ argv[j][0] == '\0' || // We should have a path here + argv[j][0] == '-' ) // We should have a path not a command line + Help (argv); + else |