summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Callen <jcallen@gentoo.org>2014-05-15 13:54:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-25 12:39:00 -0700
commitf76f133b0c3b182c2d4f4de21a04ba4c964d508d (patch)
treefde94de3abd6aa7df4d2cabfba42d0ec62e76ca0
parentf9a0974d3f7049f6f753ebd28b8f0907983acf3c (diff)
downloadlinux-stable-f76f133b0c3b182c2d4f4de21a04ba4c964d508d.tar.gz
linux-stable-f76f133b0c3b182c2d4f4de21a04ba4c964d508d.tar.bz2
linux-stable-f76f133b0c3b182c2d4f4de21a04ba4c964d508d.zip
Documentation: update java sample wrapper for java 7
The sample wrapper currently fails on some Java 7 .class files. This updates the wrapper to properly handle those files. Signed-off-by: Jonathan Callen <jcallen@gentoo.org> Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Documentation/java.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/java.txt b/Documentation/java.txt
index e6a723281547..418020584ccc 100644
--- a/Documentation/java.txt
+++ b/Documentation/java.txt
@@ -188,6 +188,9 @@ shift
#define CP_METHODREF 10
#define CP_INTERFACEMETHODREF 11
#define CP_NAMEANDTYPE 12
+#define CP_METHODHANDLE 15
+#define CP_METHODTYPE 16
+#define CP_INVOKEDYNAMIC 18
/* Define some commonly used error messages */
@@ -242,14 +245,19 @@ void skip_constant(FILE *classfile, u_int16_t *cur)
break;
case CP_CLASS:
case CP_STRING:
+ case CP_METHODTYPE:
seekerr = fseek(classfile, 2, SEEK_CUR);
break;
+ case CP_METHODHANDLE:
+ seekerr = fseek(classfile, 3, SEEK_CUR);
+ break;
case CP_INTEGER:
case CP_FLOAT:
case CP_FIELDREF:
case CP_METHODREF:
case CP_INTERFACEMETHODREF:
case CP_NAMEANDTYPE:
+ case CP_INVOKEDYNAMIC:
seekerr = fseek(classfile, 4, SEEK_CUR);
break;
case CP_LONG: