Merge pull request #29 from levyfan/dev

add illegal id check in idToPiece

Author: levyfan

.github/workflows/build.yml

@@ -5,21 +5,17 @@ on: [push, pull_request]
 jobs:
   build:
     strategy:
-      max-parallel: 10
-      fail-fast: true
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [8, 9, 10, 11]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v1
-    - name: set up JDK
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
       with:
-        java-version: ${{ matrix.java }}
-    - name: "Build"
-      run: |
-        mvn clean install
-
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Build with Maven
+      run: mvn clean install

src/main/native/com_github_google_sentencepiece_SentencePieceJNI.cc

@@ -533,7 +533,11 @@ JNIEXPORT jint JNICALL Java_com_github_google_sentencepiece_SentencePieceJNI_spp
 JNIEXPORT jstring JNICALL Java_com_github_google_sentencepiece_SentencePieceJNI_sppIdToPiece
         (JNIEnv *env, jclass cls, jlong ptr, jint id) {
     auto* spp = (SentencePieceProcessor*) ptr;
-
+    if (id < 0 || id >= spp->GetPieceSize()) {
+        jclass cls = env->FindClass("com/github/google/sentencepiece/SentencePieceException");
+        env->ThrowNew(cls, "id must be 0 <= id < GetPieceSize()");
+        return nullptr;
+    }
     const std::string &piece = spp->IdToPiece(id);
     return stringToJstring(env, piece);
 }

src/test/java/com/github/google/sentencepiece/SentencePieceProcessorTest.java

@@ -109,4 +109,9 @@ public void testSerializedProto() {
         Assert.assertNotEquals(none, sp.decodePiecesAsSerializedProto(Arrays.asList("foo", "bar")));
         Assert.assertNotEquals(none, sp.decodeIdsAsSerializedProto(20, 30));
     }
+
+    @Test
+    public void testIllegalId() {
+        Assert.assertThrows(SentencePieceException.class, () -> sp.idToPiece(38067));
+    }
 }