diff --git a/xwords4/android/XWords4/res/raw/changes b/xwords4/android/XWords4/res/raw/changes
index 3391812a8..9f7ccdb59 100644
--- a/xwords4/android/XWords4/res/raw/changes
+++ b/xwords4/android/XWords4/res/raw/changes
@@ -6,8 +6,8 @@
-Crosswords 4.4 beta 35 release
-
+Crosswords 4.4 beta 36 release
+(There was no beta 35)
- Add ability to look up words played by opponents via online
diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/XWords4/res/values/common_rsrc.xml
index 27aca3b85..9a258195b 100644
--- a/xwords4/android/XWords4/res/values/common_rsrc.xml
+++ b/xwords4/android/XWords4/res/values/common_rsrc.xml
@@ -3,7 +3,7 @@
- 4.4 beta 35
+ 4.4 beta 36
key_color_tiles
diff --git a/xwords4/common/server.c b/xwords4/common/server.c
index 5ed8bbff1..5b471e715 100644
--- a/xwords4/common/server.c
+++ b/xwords4/common/server.c
@@ -313,7 +313,7 @@ readStreamIf( ServerCtxt* server, XWStreamCtxt* in )
XP_U16 len = stream_getU16( in );
if ( 0 < len ) {
result = mkServerStream( server );
- stream_copyFromStream( in, result, len );
+ stream_copyFromStream( result, in, len );
}
return result;
}
@@ -323,7 +323,9 @@ writeStreamIf( XWStreamCtxt* dest, XWStreamCtxt* src )
{
XP_U16 len = !!src ? stream_getSize( src ) : 0;
stream_putU16( dest, len );
- stream_copyFromStream( dest, src, len );
+ if ( 0 < len ) {
+ stream_copyFromStream( dest, src, len );
+ }
}
ServerCtxt*