java-game-lib-cvs

[Brian M. <ma...@us...>]

Update of /cvsroot/java-game-lib/LWJGL/src/native/win32
In directory usw-pr-cvs1:/tmp/cvs-serv29317

Modified Files:
	org_lwjgl_openal_ALC.cpp 
Log Message:
fix: allow null to be passed to openDevice

Index: org_lwjgl_openal_ALC.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALC.cpp
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_openal_ALC.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- org_lwjgl_openal_ALC.cpp	26 Aug 2002 18:23:10 -0000	1.4
+++ org_lwjgl_openal_ALC.cpp	26 Aug 2002 21:28:30 -0000	1.5
@@ -83,14 +83,22 @@
  * ALCdevice *alcOpenDevice( const ALubyte *tokstr );
  */
 JNIEXPORT jobject JNICALL Java_org_lwjgl_openal_ALC_openDevice (JNIEnv *env, jobject obj, jstring tokstr) {
-	ALubyte* tokenstring = (ALubyte*) (env->GetStringUTFChars(tokstr, 0));
+	ALubyte* tokenstring;
+
+	if(tokstr != NULL) {
+		tokenstring = (ALubyte*) (env->GetStringUTFChars(tokstr, 0));
+	} else {
+		tokenstring = NULL;
+	}
 
 	/* get device */
 	ALCdevice* device = alcOpenDevice(tokenstring);
 
 	/* if error - cleanup and get out */
 	if(device == NULL) {
-		env->ReleaseStringUTFChars((jstring)tokenstring, 0);
+		if(tokenstring != NULL) {
+			env->ReleaseStringUTFChars((jstring)tokenstring, 0);
+		}
 		return NULL;
 	}