Merge branch 'diffbot' into diffbot-testing

XmlDoc.cpp

@@ -13514,7 +13514,11 @@ long *XmlDoc::getDiffbotTitleHashes ( long *numHashes ) {
 	if ( ! ptr_linkInfo2 ) *numHashes = 0;
 
 	// hack: use linkdbdata2 field
-	if ( m_diffbotTitleHashBufValid ) return (long *)ptr_linkInfo2;
+	if ( m_diffbotTitleHashBufValid ) {
+		// do not return NULL without g_errno set
+		if ( ptr_linkInfo2 == NULL ) return (long *)0x01;
+		return (long *)ptr_linkInfo2;
+	}
 
 	SafeBuf *tdbr = getTokenizedDiffbotReply();
 	if ( ! tdbr || tdbr == (void *)-1 ) return (long *)tdbr;
@@ -13561,6 +13565,9 @@ long *XmlDoc::getDiffbotTitleHashes ( long *numHashes ) {
 	*numHashes = size_linkInfo2 / 4;
 	m_diffbotTitleHashBufValid = true;
 
+	// if no hashes return 0x01 because NULL means g_errno
+	if ( ptr_linkInfo2 == NULL ) return (long *)0x01;
+
 	return (long *)ptr_linkInfo2;
 }
 
@@ -20294,6 +20301,7 @@ char *XmlDoc::getMetaList ( bool forDelete ) {
 		// diffbot reply if not already there.
 		long numHashes;
 		long *th = getDiffbotTitleHashes(&numHashes);
+		if ( ! th && ! g_errno ) { char *xx=NULL;*xx=0; }
 		if ( ! th || th == (void *)-1 ) return (char *)th;
 		// this returns false if it blocks
 		long *status = od->nukeJSONObjects( th , numHashes );