I am getting this error logged for browscap.module, line 392 or 397.

Checking function browscap_get_browser(), I've noticed that the only return clause (return $info;) is conditional. I suppose this can be the reason that in certain circumstances this function doesn't return an object, as expected in lines 392 and 397.

So, I believe we should:
1. ensure the returned value of browscap_get_browser() function is always an object (so we can be sure $browser in lines after 391 is always an object), or
2. check if $browser is an object or not after browscap_get_browser() call (in line 391)

CommentFileSizeAuthor
#8 cleanup-and-ensure-returned-value-1025236-8.patch3.84 KBdevin carlson
#6 cleanup-and-ensure-returned-value-1025236-6.patch3.88 KBdevin carlson
#1 browscap-1025236.patch1.28 KBalexweber

Comments

alexweber’s picture

alexweber commented
Status: Active » Needs review
StatusFileSize
new browscap-1025236.patch1.28 KB

There is already a check in place for this in browscap_exit(), I just added the same logic to browscap_unmonitor() and it fixes the issue, patch is attached.

- Alex

alexweber’s picture

alexweber commented

sorry double post, slow internet here :(

bbc’s picture

bbc
he/him/his
Location Madison, WI
commented

I'm seeing the same behavior in the logs, but the patch in #1 seems to be broken. alexweber, any chance that you can resubmit your patch? I'd be happy to help test.

devin carlson’s picture

devin carlson commented
Version: 6.x-1.1 » 6.x-1.x-dev
Category: support » bug

I'm not sure how the URL to the patch in #1 got messed up, but the patch can be found at http://drupal.org/files/issues/browscap-1025236.patch.

alexweber’s picture

alexweber commented

I haven't checked on this in a while but there's a decent chance it won't apply clean to the current dev release. Re-roll anyone?

devin carlson’s picture

devin carlson commented
Version: 6.x-1.x-dev » 7.x-1.x-dev
Assigned: Unassigned » devin carlson
StatusFileSize
new cleanup-and-ensure-returned-value-1025236-6.patch3.88 KB

The attached patch cleans up browscap_get_browser() and ensures that a set of default values are returned when there is no data on the visiting user agent.

devin carlson’s picture

devin carlson commented
Version: 7.x-1.x-dev » 6.x-1.x-dev
Status: Needs review » Patch (to be ported)

Committed to 7.x-1.x.

devin carlson’s picture

devin carlson commented
Status: Patch (to be ported) » Needs review
StatusFileSize
new cleanup-and-ensure-returned-value-1025236-8.patch3.84 KB

Backport of #6.

devin carlson’s picture

devin carlson commented
Status: Needs review » Fixed

Committed to 6.x-1.x.

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.